Merge pull request #45 from SalatielSauer/main

Fix crash when using vslot/remip commands in multiplayer & support old mapmodel command

Author: Big-Onche

src/engine/rendermodel.cpp

@@ -335,6 +335,11 @@ void mapmodel(char *name)
     mmi.m = mmi.collide = NULL;
 }
 
+void mapmodelcompat(int* rad, int* h, int* tex, char* name, char* shadow)
+{
+    mapmodel(name);
+}
+
 void mapmodelreset(int *n)
 {
     if(!(identflags&IDF_OVERRIDDEN) && !game::allowedittoggle()) return;
@@ -344,7 +349,7 @@ void mapmodelreset(int *n)
 const char *mapmodelname(int i) { return mapmodels.inrange(i) ? mapmodels[i].name : NULL; }
 
 ICOMMAND(mmodel, "s", (char *name), mapmodel(name));
-COMMAND(mapmodel, "s");
+COMMANDN(mapmodel, mapmodelcompat, "iiiss");
 COMMAND(mapmodelreset, "i");
 ICOMMAND(mapmodelname, "ii", (int *index, int *prefix), { if(mapmodels.inrange(*index)) result(mapmodels[*index].name[0] ? mapmodels[*index].name + (*prefix ? 0 : mmprefixlen) : ""); });
 ICOMMAND(mapmodelloaded, "i", (int *index), { intret(mapmodels.inrange(*index) && mapmodels[*index].m ? 1 : 0); });

src/shared/iengine.h

@@ -56,7 +56,7 @@ extern bool settexture(const char *name, int clamp = 0);
 
 // octaedit
 
-enum { EDIT_FACE = 0, EDIT_TEX, EDIT_MAT, EDIT_FLIP, EDIT_COPY, EDIT_PASTE, EDIT_ROTATE, EDIT_REPLACE, EDIT_DELCUBE, EDIT_CALCLIGHT, EDIT_REMIP, EDIT_VSLOT, EDIT_UNDO, EDIT_REDO };
+enum { EDIT_FACE = 0, EDIT_TEX, EDIT_MAT, EDIT_FLIP, EDIT_COPY, EDIT_PASTE, EDIT_ROTATE, EDIT_REPLACE, EDIT_DELCUBE, EDIT_REMIP, EDIT_VSLOT, EDIT_UNDO, EDIT_REDO, EDIT_CALCLIGHT};
 
 struct selinfo
 {