r5973 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-25 11:50:53 -0500 (Wed, 25 Feb 2009)
New Revision: 5973

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/func_breakable.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
Log:
r5969 | avirox | 2009-02-25 17:35:56 +0100 (Wed, 25 Feb 2009) | 1 line
- Breakables should be destroyed when health == 0, not under 0
r5970 | div0 | 2009-02-25 17:46:48 +0100 (Wed, 25 Feb 2009) | 2 lines
change g_maplist_mostrecent_count behaviour to insert the new map AFTER, not BEFORE loading a map. Makes it also work with the changelevel command.
r5971 | div0 | 2009-02-25 17:49:46 +0100 (Wed, 25 Feb 2009) | 2 lines
not health < 1, but health <= 0

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-02-25 16:50:05 UTC (rev 5972)
+++ branches/nexuiz-2.0/.patchsets	2009-02-25 16:50:53 UTC (rev 5973)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5949,5952-5968
+revisions_applied = 1-5949,5952-5971

Modified: branches/nexuiz-2.0/data/qcsrc/server/func_breakable.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/func_breakable.qc	2009-02-25 16:50:05 UTC (rev 5972)
+++ branches/nexuiz-2.0/data/qcsrc/server/func_breakable.qc	2009-02-25 16:50:53 UTC (rev 5973)
@@ -153,7 +153,7 @@
 	self.health = self.health - damage;
 	func_breakable_colormod();
 
-	if(self.health < 0)
+	if(self.health <= 0)
 		W_PrepareExplosionByDamage(attacker, func_breakable_destroy);
 }
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2009-02-25 16:50:05 UTC (rev 5972)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2009-02-25 16:50:53 UTC (rev 5973)
@@ -325,6 +325,7 @@
 	self = oldself;
 }
 
+void Map_MarkAsRecent(string m);
 float world_already_spawned;
 void RegisterWeapons();
 void Nagger_Init();
@@ -431,6 +432,8 @@
 	if(cvar("g_campaign"))
 		CampaignPreInit();
 
+	Map_MarkAsRecent(mapname);
+
 	InitGameplayMode();
 	readlevelcvars();
 	GrappleHookInit();
@@ -717,7 +720,7 @@
 
 void Map_MarkAsRecent(string m)
 {
-	cvar_set("g_maplist_mostrecent", strwords(strcat(m, " ", cvar_string("g_maplist_mostrecent")), cvar("g_maplist_mostrecent_count")));
+	cvar_set("g_maplist_mostrecent", strwords(strcat(m, " ", cvar_string("g_maplist_mostrecent")), max(0, cvar("g_maplist_mostrecent_count"))));
 }
 
 float Map_IsRecent(string m)
@@ -732,8 +735,6 @@
 	map_next = argv(position);
 	if(pass <= 1)
 	{
-		if(map_next == Map_Current_Name) // same map again in first pass?
-			return 0;
 		if(Map_IsRecent(map_next))
 			return 0;
 	}
@@ -778,7 +779,6 @@
 
 void Map_Goto()
 {
-	Map_MarkAsRecent(getmapname_stored);
 	GameResetCfg();
 	MapInfo_LoadMap(getmapname_stored);
 }