fix a < 256 check that should have been < MAX_LIGHTSTYLES

[xonotic/darkplaces.git] / prvm_cmds.c

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 0ea7436e2bac3f4be766c64592dc5bb7dbbf2357..735ad7a2e663fec823b27b95b90c30a94d6df7b6 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -749,13 +749,20 @@ void VM_remove (void)
        VM_SAFEPARMCOUNT(1, VM_remove);
 
        ed = PRVM_G_EDICT(OFS_PARM0);
-       if( PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts ) {
+       if( PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts )
+       {
                Con_DPrint( "VM_remove: tried to remove the null entity or a reserved entity!\n" );
-       } else if( ed->priv.required->free ) {
+               if (developer.integer >= 1)
+                       PRVM_PrintState();
+       }
+       else if( ed->priv.required->free )
+       {
                Con_DPrint( "VM_remove: tried to remove an already freed entity!\n" );
-       } else {
-               PRVM_ED_Free (ed);
+               if (developer.integer >= 1)
+                       PRVM_PrintState();
        }
+       else
+               PRVM_ED_Free (ed);
 //     if (ed == prog->edicts)
 //             PRVM_ERROR ("remove: tried to remove world");
 //     if (PRVM_NUM_FOR_EDICT(ed) <= sv.maxclients)
@@ -2007,9 +2014,9 @@ void VM_getostype(void)
        OS_MAC - not supported
        */
 
-#ifdef _WIN32
+#ifdef WIN32
        PRVM_G_FLOAT(OFS_RETURN) = 0;
-#elif defined _MAC
+#elif defined(MACOSX)
        PRVM_G_FLOAT(OFS_RETURN) = 2;
 #else
        PRVM_G_FLOAT(OFS_RETURN) = 1;
@@ -3075,7 +3082,7 @@ void VM_AddPolygonsToMeshQueue (void)
        if(!vm_drawpolygons_num)
                return;
        for(i = 0;i < vm_drawpolygons_num;i++)
-               R_MeshQueue_Add(VM_DrawPolygonCallback, NULL, i, NULL);
+               VM_DrawPolygonCallback(NULL, NULL, i, NULL);
        vm_drawpolygons_num = 0;
 }