From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 29 May 2005 04:58:38 +0000 (+0000)
Subject: fixed makefile (it is not possible to comment out lines with \ at the end)
X-Git-Tag: xonotic-v0.1.0preview~4837
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22cb365eac64641816ec25c81fbacceb7bc655fa;p=xonotic%2Fdarkplaces.git

fixed makefile (it is not possible to comment out lines with \ at the end)
fixed two warnings


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5345 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/makefile.inc b/makefile.inc
index a143524d..31055a99 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -75,9 +75,6 @@ OBJ_COMMON= \
 	palette.o \
 	polygon.o \
 	portals.o \
-#	pr_cmds.o \
-#	pr_edict.o \
-#	pr_exec.o \
 	protocol.o \
 	mvm_cmds.o \
 	svvm_cmds.o \
diff --git a/prvm_edict.c b/prvm_edict.c
index ea7c7f39..8420dce8 100644
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -187,7 +187,6 @@ Sets everything to NULL
 */
 void PRVM_ED_ClearEdict (prvm_edict_t *e)
 {
-	int num;
 	memset (e->fields.vp, 0, prog->progs->entityfields * 4);
 	e->priv.required->free = false;
 
diff --git a/sv_main.c b/sv_main.c
index ff2bfe56..e72a0565 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -1637,7 +1637,7 @@ void SV_SpawnServer (const char *server)
 //
 // tell all connected clients that we are going to a new level
 //
-	if (sv.active) 
+	if (sv.active)
 	{
 		SV_VM_Begin();
 		SV_SendReconnect();
@@ -1755,7 +1755,7 @@ void SV_SpawnServer (const char *server)
 //
 // load the rest of the entities
 //
-	// AK possible hack since num_edicts is still 0 
+	// AK possible hack since num_edicts is still 0
 	ent = PRVM_EDICT_NUM(0);
 	memset (ent->fields.server, 0, prog->progs->entityfields * 4);
 	ent->priv.server->free = false;
@@ -1924,7 +1924,7 @@ void SV_VM_CB_CountEdicts(void)
 	Con_Printf("step      :%3i\n", step);
 }
 
-qboolean SV_VM_CB_LoadEdict(prvm_edict_t *ent) 
+qboolean SV_VM_CB_LoadEdict(prvm_edict_t *ent)
 {
 	// remove things from different skill levels or deathmatch
 	if (gamemode != GAME_TRANSFUSION) //Transfusion does this in QC
@@ -2205,7 +2205,7 @@ void SV_VM_Setup(void)
 	prog->load_edict = SV_VM_CB_LoadEdict;
 	prog->init_cmd = VM_SV_Cmd_Init;
 	prog->reset_cmd = VM_SV_Cmd_Reset;
-	prog->error_cmd = NULL; // change this 
+	prog->error_cmd = NULL; // change this
 
 	// TODO: add a requiredfuncs list (ask LH if this is necessary at all)
 	PRVM_LoadProgs( sv_progs.string, 0, NULL, REQFIELDS, reqfields );
@@ -2225,4 +2225,4 @@ void SV_VM_Begin(void)
 void SV_VM_End(void)
 {
 	PRVM_End;
-}
\ No newline at end of file
+}