SRB2 2.1.12 release

oneup03 · Nov 12, 2014 · 404b5f6 · 404b5f6
1 parent 3fe4921
commit 404b5f6
Show file tree

Hide file tree

Showing 139 changed files with 2,516 additions and 1,471 deletions.
diff --git a/doc/manual/1up.png b/doc/manual/1up.png
diff --git a/doc/manual/RNGA0000.png b/doc/manual/RNGA0000.png
diff --git a/doc/manual/RNGB0000.png b/doc/manual/RNGB0000.png
diff --git a/doc/manual/RNGE0000.png b/doc/manual/RNGE0000.png
diff --git a/doc/manual/RNGG0000.png b/doc/manual/RNGG0000.png
diff --git a/doc/manual/RNGR0000.png b/doc/manual/RNGR0000.png
diff --git a/doc/manual/RNGS0000.png b/doc/manual/RNGS0000.png
diff --git a/doc/manual/Ring0000.png b/doc/manual/Ring0000.png
diff --git a/doc/manual/acz.png b/doc/manual/acz.png
diff --git a/doc/manual/airspin.png b/doc/manual/airspin.png
diff --git a/doc/manual/attack.png b/doc/manual/attack.png
diff --git a/doc/manual/blue_monitor.png b/doc/manual/blue_monitor.png
diff --git a/doc/manual/blue_ring.png b/doc/manual/blue_ring.png
diff --git a/doc/manual/bshield.png b/doc/manual/bshield.png
diff --git a/doc/manual/cez.png b/doc/manual/cez.png
diff --git a/doc/manual/controls.png b/doc/manual/controls.png
diff --git a/doc/manual/conveyor.png b/doc/manual/conveyor.png
diff --git a/doc/manual/coop.png b/doc/manual/coop.png
diff --git a/doc/manual/crusher.png b/doc/manual/crusher.png
diff --git a/doc/manual/ctf.png b/doc/manual/ctf.png
diff --git a/doc/manual/dsz.png b/doc/manual/dsz.png
diff --git a/doc/manual/eggbox.png b/doc/manual/eggbox.png
diff --git a/doc/manual/eggman.png b/doc/manual/eggman.png
diff --git a/doc/manual/emblem.png b/doc/manual/emblem.png
diff --git a/doc/manual/fan.png b/doc/manual/fan.png
diff --git a/doc/manual/gfz.png b/doc/manual/gfz.png
diff --git a/doc/manual/gshield.png b/doc/manual/gshield.png
diff --git a/doc/manual/invc.png b/doc/manual/invc.png
diff --git a/doc/manual/knuckles.png b/doc/manual/knuckles.png
diff --git a/doc/manual/koneup.png b/doc/manual/koneup.png
diff --git a/doc/manual/manual.htm b/doc/manual/manual.htm
@@ -13,7 +13,7 @@
 		doc = doc || document;
 		// from http://stackoverflow.com/questions/1145850/get-height-of-entire-document-with-javascript
 		var body = doc.body, html = doc.documentElement;
-		var height = Math.max( body.scrollHeight, body.offsetHeight, 
+		var height = Math.max( body.scrollHeight, body.offsetHeight,
 			html.clientHeight, html.scrollHeight, html.offsetHeight );
 		return height;
 }
@@ -65,4 +65,4 @@
 		<iframe id="ifrm" name="ifrm" src="intro.htm" onload="setIframeHeight(this.id)"> </iframe>
 	</p>
 </body>
-</html>
+</html>
diff --git a/doc/manual/match.png b/doc/manual/match.png
diff --git a/doc/manual/metal.png b/doc/manual/metal.png
diff --git a/doc/manual/mixup.png b/doc/manual/mixup.png
diff --git a/doc/manual/pit.png b/doc/manual/pit.png
diff --git a/doc/manual/platform.png b/doc/manual/platform.png
diff --git a/doc/manual/race.png b/doc/manual/race.png
diff --git a/doc/manual/random.png b/doc/manual/random.png
diff --git a/doc/manual/recycler.png b/doc/manual/recycler.png
diff --git a/doc/manual/red_monitor.png b/doc/manual/red_monitor.png
diff --git a/doc/manual/red_ring.png b/doc/manual/red_ring.png
diff --git a/doc/manual/ring.png b/doc/manual/ring.png
diff --git a/doc/manual/rshield.png b/doc/manual/rshield.png
diff --git a/doc/manual/rvz.png b/doc/manual/rvz.png
diff --git a/doc/manual/shoes.png b/doc/manual/shoes.png
diff --git a/doc/manual/slime.png b/doc/manual/slime.png
diff --git a/doc/manual/soneup.png b/doc/manual/soneup.png
diff --git a/doc/manual/spring1.png b/doc/manual/spring1.png
diff --git a/doc/manual/spring2.png b/doc/manual/spring2.png
diff --git a/doc/manual/spring3.png b/doc/manual/spring3.png
diff --git a/doc/manual/spring4.png b/doc/manual/spring4.png
diff --git a/doc/manual/spring5.png b/doc/manual/spring5.png
diff --git a/doc/manual/spring6.png b/doc/manual/spring6.png
diff --git a/doc/manual/spring7.png b/doc/manual/spring7.png
diff --git a/doc/manual/spring8.png b/doc/manual/spring8.png
diff --git a/doc/manual/stats_lives.png b/doc/manual/stats_lives.png
diff --git a/doc/manual/stats_rings.png b/doc/manual/stats_rings.png
diff --git a/doc/manual/tag.png b/doc/manual/tag.png
diff --git a/doc/manual/tailsfly.png b/doc/manual/tailsfly.png
diff --git a/doc/manual/thanks.png b/doc/manual/thanks.png
diff --git a/doc/manual/thz.png b/doc/manual/thz.png
diff --git a/doc/manual/title.png b/doc/manual/title.png
diff --git a/doc/manual/token.png b/doc/manual/token.png
diff --git a/doc/manual/toneup.png b/doc/manual/toneup.png
diff --git a/doc/manual/unknown.png b/doc/manual/unknown.png
diff --git a/doc/manual/water.png b/doc/manual/water.png
diff --git a/doc/manual/wpnpanel_auto.png b/doc/manual/wpnpanel_auto.png
diff --git a/doc/manual/wpnpanel_bounce.png b/doc/manual/wpnpanel_bounce.png
diff --git a/doc/manual/wpnpanel_explosion.png b/doc/manual/wpnpanel_explosion.png
diff --git a/doc/manual/wpnpanel_grenade.png b/doc/manual/wpnpanel_grenade.png
diff --git a/doc/manual/wpnpanel_rail.png b/doc/manual/wpnpanel_rail.png
diff --git a/doc/manual/wpnpanel_scatter.png b/doc/manual/wpnpanel_scatter.png
diff --git a/doc/manual/wshield.png b/doc/manual/wshield.png
diff --git a/doc/manual/yshield.png b/doc/manual/yshield.png
diff --git a/readme.txt b/readme.txt
@@ -1,4 +1,4 @@
-Here it is! SRB2 v2.1.11 source code!
+Here it is! SRB2 v2.1.12 source code!
 (why do we keep the version number up to date
 	when everything else in this file is hilariously old?
 	- Inuyasha)

diff --git a/src/blua/lapi.c b/src/blua/lapi.c
@@ -319,21 +319,6 @@ LUA_API lua_Number lua_tonumber (lua_State *L, int idx) {
     return 0;
 }
 
-
-LUA_API lua_Integer lua_tointeger (lua_State *L, int idx) {
-  TValue n;
-  const TValue *o = index2adr(L, idx);
-  if (tonumber(o, &n)) {
-    lua_Integer res;
-    lua_Number num = nvalue(o);
-    lua_number2integer(res, num);
-    return res;
-  }
-  else
-    return 0;
-}
-
-
 LUA_API int lua_toboolean (lua_State *L, int idx) {
   const TValue *o = index2adr(L, idx);
   return !l_isfalse(o);
@@ -446,14 +431,6 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
 }
 
 
-LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
-  lua_lock(L);
-  setnvalue(L->top, cast_num(n));
-  api_incr_top(L);
-  lua_unlock(L);
-}
-
-
 LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
   lua_lock(L);
   luaC_checkGC(L);

diff --git a/src/blua/lauxlib.c b/src/blua/lauxlib.c
@@ -186,20 +186,6 @@ LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) {
 }
 
 
-LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) {
-  lua_Integer d = lua_tointeger(L, narg);
-  if (d == 0 && !lua_isnumber(L, narg))  /* avoid extra test when d is not 0 */
-    tag_error(L, narg, LUA_TNUMBER);
-  return d;
-}
-
-
-LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int narg,
-                                                      lua_Integer def) {
-  return luaL_opt(L, luaL_checkinteger, narg, def);
-}
-
-
 LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
   if (!lua_getmetatable(L, obj))  /* no metatable? */
     return 0;

diff --git a/src/blua/lauxlib.h b/src/blua/lauxlib.h
@@ -54,9 +54,8 @@ LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg,
 LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg);
 LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def);
 
-LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
-LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
-                                          lua_Integer def);
+#define luaL_checkinteger luaL_checknumber
+#define luaL_optinteger luaL_optnumber
 
 LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
 LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);

diff --git a/src/blua/lua.h b/src/blua/lua.h
@@ -100,7 +100,7 @@ typedef LUA_NUMBER lua_Number;
 
 
 /* type for integer functions */
-typedef LUA_INTEGER lua_Integer;
+#define lua_Integer lua_Number
 
 
 
@@ -144,7 +144,7 @@ LUA_API int            (lua_rawequal) (lua_State *L, int idx1, int idx2);
 LUA_API int            (lua_lessthan) (lua_State *L, int idx1, int idx2);
 
 LUA_API lua_Number      (lua_tonumber) (lua_State *L, int idx);
-LUA_API lua_Integer     (lua_tointeger) (lua_State *L, int idx);
+#define lua_tointeger lua_tonumber
 LUA_API int             (lua_toboolean) (lua_State *L, int idx);
 LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
 LUA_API size_t          (lua_objlen) (lua_State *L, int idx);
@@ -159,7 +159,7 @@ LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
 */
 LUA_API void  (lua_pushnil) (lua_State *L);
 LUA_API void  (lua_pushnumber) (lua_State *L, lua_Number n);
-LUA_API void  (lua_pushinteger) (lua_State *L, lua_Integer n);
+#define lua_pushinteger lua_pushnumber
 LUA_API void  (lua_pushlstring) (lua_State *L, const char *s, size_t l);
 LUA_API void  (lua_pushstring) (lua_State *L, const char *s);
 LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,

diff --git a/src/blua/lvm.c b/src/blua/lvm.c
@@ -323,7 +323,7 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
       case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); break;
       case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); break;
       case TM_DIV: if (nc == 0) { lua_pushliteral(L, "divide by zero error"); lua_error(L); } else setnvalue(ra, luai_numdiv(nb, nc)); break;
-      case TM_MOD: setnvalue(ra, luai_nummod(nb, nc)); break;
+      case TM_MOD: if (nc == 0) { lua_pushliteral(L, "modulo by zero error"); lua_error(L); } else setnvalue(ra, luai_nummod(nb, nc)); break;
       case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); break;
       case TM_UNM: setnvalue(ra, luai_numunm(nb)); break;
       case TM_AND: setnvalue(ra, luai_numand(nb, nc)); break;
@@ -494,7 +494,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
           if (nc == 0) {
             lua_pushliteral(L, "divide by zero error");
             lua_error(L);
-					}
+          }
           else
             setnvalue(ra, luai_numdiv(nb, nc));
         }
@@ -503,7 +503,19 @@ void luaV_execute (lua_State *L, int nexeccalls) {
         continue;
       }
       case OP_MOD: {
-        arith_op(luai_nummod, TM_MOD);
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        if (ttisnumber(rb) && ttisnumber(rc)) {
+          lua_Number nb = nvalue(rb), nc = nvalue(rc);
+          if (nc == 0) {
+            lua_pushliteral(L, "modulo by zero error");
+            lua_error(L);
+          }
+          else
+            setnvalue(ra, luai_nummod(nb, nc));
+        }
+        else
+          Protect(Arith(L, ra, rb, rc, TM_MOD));
         continue;
       }
       case OP_POW: {

diff --git a/src/command.c b/src/command.c
@@ -1055,9 +1055,22 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 
 	if (var->PossibleValue)
 	{
-		INT32 v = atoi(valstr);
-		if (!v && valstr[0] != '0')
-			v = INT32_MIN; // Invalid integer trigger
+		INT32 v;
+
+		if (var->flags & CV_FLOAT)
+		{
+			double d = atof(valstr);
+			if (!d && valstr[0] != '0')
+				v = INT32_MIN;
+			else
+				v = (INT32)(d * FRACUNIT);
+		}
+		else
+		{
+			v = atoi(valstr);
+			if (!v && valstr[0] != '0')
+				v = INT32_MIN; // Invalid integer trigger
+		}
 
 		if (var->PossibleValue[0].strvalue && !stricmp(var->PossibleValue[0].strvalue, "MIN")) // bounded cvar
 		{
@@ -1134,13 +1147,13 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
 
 	var->string = var->zstring = Z_StrDup(valstr);
 
-	if (var->flags & CV_FLOAT)
+	if (override)
+		var->value = overrideval;
+	else if (var->flags & CV_FLOAT)
 	{
 		double d = atof(var->string);
 		var->value = (INT32)(d * FRACUNIT);
 	}
-	else if (override)
-		var->value = overrideval;
 	else
 		var->value = atoi(var->string);
 

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
@@ -2921,13 +2921,25 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 			displayplayer = newplayernum;
 			secondarydisplayplayer = newplayernum;
 			DEBFILE("spawning me\n");
+			// Apply player flags as soon as possible!
+			players[newplayernum].pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
+			if (cv_flipcam.value)
+				players[newplayernum].pflags |= PF_FLIPCAM;
+			if (cv_analog.value)
+				players[newplayernum].pflags |= PF_ANALOGMODE;
 		}
 		else
 		{
 			secondarydisplayplayer = newplayernum;
 			DEBFILE("spawning my brother\n");
 			if (botingame)
 				players[newplayernum].bot = 1;
+			// Same goes for player 2 when relevant
+			players[newplayernum].pflags &= ~(/*PF_FLIPCAM|*/PF_ANALOGMODE);
+			//if (cv_flipcam2.value)
+				//players[newplayernum].pflags |= PF_FLIPCAM;
+			if (cv_analog2.value)
+				players[newplayernum].pflags |= PF_ANALOGMODE;
 		}
 		D_SendPlayerConfig();
 		addedtogame = true;

diff --git a/src/d_main.c b/src/d_main.c
@@ -1087,14 +1087,14 @@ void D_SRB2Main(void)
 #endif
 	D_CleanFile();
 
-#if 1 // md5s last updated 8/05/14
+#if 1 // md5s last updated 11/10/14
 
 	// Check MD5s of autoloaded files
 	W_VerifyFileMD5(0, "ac309fb3c7d4b5b685e2cd26beccf0e8"); // srb2.srb/srb2.wad
 	W_VerifyFileMD5(1, "f39b6c849295e3c81875726e8cc0e2c7"); // zones.dta
 	W_VerifyFileMD5(2, "cfca0f1c73023cbbd8f844f45480f799"); // player.dta
 	W_VerifyFileMD5(3, "85901ad4bf94637e5753d2ac2c03ea26"); // rings.dta
-	W_VerifyFileMD5(4, "3d6cfc185fd7c195eb934ce593b0248f"); // patch.dta
+	W_VerifyFileMD5(4, "a45cc59d13dce924f2112b3e4201d0ae"); // patch.dta
 	// don't check music.dta because people like to modify it, and it doesn't matter if they do
 	// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
 #endif

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
@@ -164,6 +164,7 @@ static void Command_Archivetest_f(void);
 // =========================================================================
 
 void SendWeaponPref(void);
+void SendWeaponPref2(void);
 
 static CV_PossibleValue_t usemouse_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Force"}, {0, NULL}};
 #if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
@@ -1345,26 +1346,34 @@ void SendWeaponPref(void)
 	XBOXSTATIC UINT8 buf[1];
 
 	buf[0] = 0;
-	if (cv_flipcam.value)
+	if (players[consoleplayer].pflags & PF_FLIPCAM)
 		buf[0] |= 1;
+	if (players[consoleplayer].pflags & PF_ANALOGMODE)
+		buf[0] |= 2;
 	SendNetXCmd(XD_WEAPONPREF, buf, 1);
+}
 
-	if (splitscreen)
-	{
-		buf[0] = 0;
-		if (cv_flipcam2.value)
-			buf[0] |= 1;
-		SendNetXCmd2(XD_WEAPONPREF, buf, 1);
-	}
+void SendWeaponPref2(void)
+{
+	XBOXSTATIC UINT8 buf[1];
+
+	buf[0] = 0;
+	if (players[secondarydisplayplayer].pflags & PF_FLIPCAM)
+		buf[0] |= 1;
+	if (players[secondarydisplayplayer].pflags & PF_ANALOGMODE)
+		buf[0] |= 2;
+	SendNetXCmd2(XD_WEAPONPREF, buf, 1);
 }
 
 static void Got_WeaponPref(UINT8 **cp,INT32 playernum)
 {
 	UINT8 prefs = READUINT8(*cp);
+
+	players[playernum].pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
 	if (prefs & 1)
 		players[playernum].pflags |= PF_FLIPCAM;
-	else
-		players[playernum].pflags &= ~PF_FLIPCAM;
+	if (prefs & 2)
+		players[playernum].pflags |= PF_ANALOGMODE;
 }
 
 void D_SendPlayerConfig(void)
@@ -1373,6 +1382,8 @@ void D_SendPlayerConfig(void)
 	if (splitscreen || botingame)
 		SendNameAndColor2();
 	SendWeaponPref();
+	if (splitscreen)
+		SendWeaponPref2();
 }
 
 // Only works for displayplayer, sorry!
@@ -1798,7 +1809,6 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
 	if (demorecording) // Okay, level loaded, character spawned and skinned,
 		G_BeginRecording(); // I AM NOW READY TO RECORD.
 	demo_start = true;
-	metal_start = true;
 }
 
 static void Command_Pause(void)

diff --git a/src/d_player.h b/src/d_player.h
@@ -151,6 +151,7 @@ typedef enum
 
 	/*** misc ***/
 	PF_FORCESTRAFE       = 1<<29, // Turning inputs are translated into strafing inputs
+	PF_ANALOGMODE        = 1<<30, // Analog mode?
 
 	// free: 1<<30 and 1<<31
 } pflags_t;

diff --git a/src/dehacked.c b/src/dehacked.c
@@ -7273,6 +7273,7 @@ static const char *const PLAYERFLAG_LIST[] = {
 
 	/*** misc ***/
 	"FORCESTRAFE", // Translate turn inputs into strafe inputs
+	"ANALOGMODE", // Analog mode?
 
 	NULL // stop loop here.
 };

diff --git a/src/doomdef.h b/src/doomdef.h
@@ -144,8 +144,8 @@ extern FILE *logstream;
 #define VERSIONSTRING "Trunk"
 #else
 #define VERSION    201 // Game version
-#define SUBVERSION 11  // more precise version number
-#define VERSIONSTRING "v2.1.11"
+#define SUBVERSION 12  // more precise version number
+#define VERSIONSTRING "v2.1.12"
 #endif
 
 // Modification options
@@ -428,9 +428,8 @@ extern const char *compdate, *comptime, *comprevision;
 // Compile them at your own risk!
 
 ///	Max recursive portal renders
-///	\note	sadly some additional work will need to be done
-///	     	before anything > 1 will function correctly
-#define PORTAL_LIMIT 1
+///	\note	obsoleted by cv_maxportals
+//#define PORTAL_LIMIT 8
 
 ///	Fun experimental slope stuff!
 //#define SLOPENESS
@@ -453,7 +452,7 @@ extern const char *compdate, *comptime, *comprevision;
 //#define CHAOSISNOTDEADYET
 
 ///	Polyobject fake flat code
-//#define POLYOBJECTS_PLANES
+#define POLYOBJECTS_PLANES
 
 ///	Blue spheres for future use.
 ///	\todo	Remove this define.
@@ -493,4 +492,7 @@ extern const char *compdate, *comptime, *comprevision;
 #define CLIENT_LOADINGSCREEN
 #endif
 
+/// Experimental tweaks to analog mode. (Needs a lot of work before it's ready for primetime.)
+//#define REDSANALOG
+
 #endif // __DOOMDEF__
diff --git a/src/doomstat.h b/src/doomstat.h
@@ -165,7 +165,6 @@ extern cutscene_t *cutscenes[128];
 
 // For the Custom Exit linedef.
 extern INT16 nextmapoverride;
-extern INT32 nextmapgametype;
 extern boolean skipstats;
 
 extern UINT32 totalrings; //  Total # of rings in a level