Merge pull request #1 from rheit/master

Merge branch 'master' of https://github.com/rheit/zdoom
cmbruns · Nov 20, 2013 · 75968f5 · 75968f5
2 parents a967b05 + fe67ae5
commit 75968f5
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 15 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -143,6 +143,11 @@ if( WIN32 )
 		ws2_32
 		setupapi
 		oleaut32 )
+
+	# For some reason this isn't implied on 2005
+	if( MSVC80 )
+		set( ZDOOM_LIBS ${ZDOOM_LIBS} DelayImp )
+	endif( MSVC80 )
 else( WIN32 )
 	if( APPLE )
 		set( FMOD_SEARCH_PATHS "/Developer/FMOD Programmers API Mac/api" )
@@ -1097,7 +1102,11 @@ endif( NOT ZDOOM_OUTPUT_OLDSTYLE OR NO_GENERATOR_EXPRESSIONS )
 if( MSVC )
 	option( ZDOOM_GENERATE_MAPFILE "Generate .map file for debugging." OFF )
 	if( ZDOOM_GENERATE_MAPFILE )
-		set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\" /MAP:${ZDOOM_EXE_NAME}.map")
+		if( NOT MSVC80 )
+			set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\" /MAP:${ZDOOM_EXE_NAME}.map")
+		else( NOT MSVC80 ) # 2005 doesn't support naming the map file.
+			set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\" /MAP")
+		endif( NOT MSVC80 )
 	else( ZDOOM_GENERATE_MAPFILE )
 		set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\"")
 	endif( ZDOOM_GENERATE_MAPFILE )

diff --git a/src/g_game.cpp b/src/g_game.cpp
@@ -565,7 +565,7 @@ void G_BuildTiccmd (ticcmd_t *cmd)
 		int tspeed = speed;
 
 		if (turnheld < SLOWTURNTICS)
-			tspeed *= 2;		// slow turn
+			tspeed += 2;		// slow turn
 
 		if (Button_Right.bDown)
 		{

diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
@@ -522,19 +522,8 @@ static void ParseReplies (FStrifeDialogueReply **replyptr, Response *responses)
 
 		// If the first item check has a positive amount required, then
 		// add that to the reply string. Otherwise, use the reply as-is.
-		if (rsp->Count[0] > 0)
-		{
-			char moneystr[128];
-
-			mysnprintf (moneystr, countof(moneystr), "%s for %u", rsp->Reply, rsp->Count[0]);
-			reply->Reply = copystring (moneystr);
-			reply->NeedsGold = true;
-		}
-		else
-		{
-			reply->Reply = copystring (rsp->Reply);
-			reply->NeedsGold = false;
-		}
+		reply->Reply = copystring (rsp->Reply);
+		reply->NeedsGold = (rsp->Count[0] > 0);
 
 		// QuickYes messages are shown when you meet the item checks.
 		// QuickNo messages are shown when you don't.

diff --git a/wadsrc/static/actors/heretic/hereticammo.txt b/wadsrc/static/actors/heretic/hereticammo.txt
@@ -221,6 +221,7 @@ ACTOR BagOfHolding : BackpackItem 8
 	Inventory.PickupMessage "$TXT_ITEMBAGOFHOLDING"
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	States
 	{
 	Spawn:

diff --git a/wadsrc/static/actors/heretic/hereticarmor.txt b/wadsrc/static/actors/heretic/hereticarmor.txt
@@ -6,6 +6,7 @@ Actor SilverShield : BasicArmorPickup 85
 	Game Heretic
 	SpawnID 68
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.Pickupmessage "$TXT_ITEMSHIELD1"
 	Inventory.Icon "SHLDA0"
 	Armor.Savepercent 50
@@ -25,6 +26,7 @@ Actor EnchantedShield : BasicArmorPickup 31
 	Game Heretic
 	SpawnID 69
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.Pickupmessage "$TXT_ITEMSHIELD2"
 	Inventory.Icon "SHD2A0"
 	Armor.Savepercent 75

diff --git a/wadsrc/static/actors/heretic/hereticartifacts.txt b/wadsrc/static/actors/heretic/hereticartifacts.txt
@@ -7,6 +7,7 @@ ACTOR SuperMap : MapRevealer 35
 	+COUNTITEM
 	+INVENTORY.ALWAYSPICKUP
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.MaxAmount 0
 	Inventory.PickupMessage "$TXT_ITEMSUPERMAP"
 	States
@@ -26,6 +27,7 @@ ACTOR ArtiInvisibility : PowerupGiver 75
 	SpawnID 135
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	RenderStyle Translucent
 	Alpha 0.4
@@ -51,6 +53,7 @@ ACTOR ArtiTomeOfPower : PowerupGiver 86 native
 	SpawnID 134
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	Inventory.Icon "ARTIPWBK"
 	Powerup.Type Weaponlevel2
@@ -94,6 +97,7 @@ ACTOR ArtiTimeBomb : Inventory 34 native
 	SpawnID 72
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	+INVENTORY.INVBAR
 	+INVENTORY.FANCYPICKUPSOUND

diff --git a/wadsrc/static/actors/hexen/blastradius.txt b/wadsrc/static/actors/hexen/blastradius.txt
@@ -4,6 +4,7 @@ ACTOR ArtiBlastRadius : CustomInventory 10110
 	Game Hexen
 	SpawnID 74
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.DefMaxAmount
 	Inventory.PickupFlash "PickupFlash"
 	+INVBAR +FANCYPICKUPSOUND

diff --git a/wadsrc/static/actors/hexen/boostarmor.txt b/wadsrc/static/actors/hexen/boostarmor.txt
@@ -7,6 +7,7 @@ ACTOR ArtiBoostArmor : Inventory 8041 native
 	SpawnID 22
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.DefMaxAmount
 	Inventory.PickupFlash "PickupFlash"
 	+INVBAR +FANCYPICKUPSOUND

diff --git a/wadsrc/static/actors/hexen/clericholy.txt b/wadsrc/static/actors/hexen/clericholy.txt
@@ -8,6 +8,7 @@ ACTOR ClericWeaponPiece : WeaponPiece
 	Inventory.ForbiddenTo FighterPlayer, MagePlayer
 	WeaponPiece.Weapon CWeapWraithverge
 	+FLOATBOB
+	+NOGRAVITY
 }
 
 // Cleric Weapon Piece 1 ----------------------------------------------------

diff --git a/wadsrc/static/actors/hexen/fighterquietus.txt b/wadsrc/static/actors/hexen/fighterquietus.txt
@@ -8,6 +8,7 @@ ACTOR FighterWeaponPiece : WeaponPiece
 	Inventory.ForbiddenTo ClericPlayer, MagePlayer
 	WeaponPiece.Weapon FWeapQuietus
 	+FLOATBOB
+	+NOGRAVITY
 }
 
 // Fighter Weapon Piece 1 ---------------------------------------------------

diff --git a/wadsrc/static/actors/hexen/flechette.txt b/wadsrc/static/actors/hexen/flechette.txt
@@ -99,6 +99,7 @@ ACTOR ArtiPoisonBag : Inventory 8000 native
 	Game Hexen
 	SpawnID 72
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.DefMaxAmount
 	Inventory.PickupFlash "PickupFlash"
 	+INVBAR +FANCYPICKUPSOUND

diff --git a/wadsrc/static/actors/hexen/fog.txt b/wadsrc/static/actors/hexen/fog.txt
@@ -6,6 +6,7 @@ ACTOR FogSpawner 10000
 	Game Hexen
 	+NOSECTOR +NOBLOCKMAP
 	+FLOATBOB
+	+NOGRAVITY
 	+INVISIBLE
 
 	action native A_FogSpawn();

diff --git a/wadsrc/static/actors/hexen/healingradius.txt b/wadsrc/static/actors/hexen/healingradius.txt
@@ -6,6 +6,7 @@ ACTOR ArtiHealingRadius : Inventory 10120 native
 	Game Hexen
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.DefMaxAmount
 	+INVENTORY.INVBAR 
 	+INVENTORY.PICKUPFLASH

diff --git a/wadsrc/static/actors/hexen/magestaff.txt b/wadsrc/static/actors/hexen/magestaff.txt
@@ -8,6 +8,7 @@ ACTOR MageWeaponPiece : WeaponPiece
 	Inventory.ForbiddenTo FighterPlayer, ClericPlayer
 	WeaponPiece.Weapon MWeapBloodscourge
 	+FLOATBOB
+	+NOGRAVITY
 }
 
 // Mage Weapon Piece 1 ------------------------------------------------------

diff --git a/wadsrc/static/actors/hexen/mana.txt b/wadsrc/static/actors/hexen/mana.txt
@@ -11,6 +11,7 @@ ACTOR Mana1 : Ammo 122
 	Radius 8
 	Height 8
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.Icon "MAN1I0"
 	Inventory.PickupMessage "$TXT_MANA_1"
 	States
@@ -34,6 +35,7 @@ ACTOR Mana2 : Ammo 124
 	Radius 8
 	Height 8
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.Icon "MAN2G0"
 	Inventory.PickupMessage "$TXT_MANA_2"
 	States
@@ -53,6 +55,7 @@ ACTOR Mana3 : CustomInventory 8004
 	Radius 8
 	Height 8
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.PickupMessage "$TXT_MANA_BOTH"
 	States
 	{
@@ -73,6 +76,7 @@ ACTOR ArtiBoostMana : CustomInventory 8003
 	Game Hexen
 	SpawnID 26
 	+FLOATBOB
+	+NOGRAVITY
 	+COUNTITEM
 	+INVENTORY.INVBAR
 	+INVENTORY.PICKUPFLASH

diff --git a/wadsrc/static/actors/hexen/speedboots.txt b/wadsrc/static/actors/hexen/speedboots.txt
@@ -5,6 +5,7 @@ ACTOR ArtiSpeedBoots : PowerupGiver 8002
 	Game Hexen
 	SpawnID 13
 	+FLOATBOB
+	+NOGRAVITY
 	+COUNTITEM
 	+INVENTORY.PICKUPFLASH
 	Inventory.Icon ARTISPED

diff --git a/wadsrc/static/actors/hexen/summon.txt b/wadsrc/static/actors/hexen/summon.txt
@@ -7,6 +7,7 @@ ACTOR ArtiDarkServant : Inventory 86 native
 	SpawnID 16
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.RespawnTics 4230
 	Inventory.DefMaxAmount
 	Inventory.PickupFlash "PickupFlash"

diff --git a/wadsrc/static/actors/hexen/teleportother.txt b/wadsrc/static/actors/hexen/teleportother.txt
@@ -7,6 +7,7 @@ ACTOR ArtiTeleportOther : Inventory 10040 native
 	SpawnID 17
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.INVBAR
 	+INVENTORY.PICKUPFLASH
 	+INVENTORY.FANCYPICKUPSOUND

diff --git a/wadsrc/static/actors/raven/artiegg.txt b/wadsrc/static/actors/raven/artiegg.txt
@@ -31,6 +31,7 @@ ACTOR ArtiEgg : CustomInventory 30
 	SpawnID 14
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.INVBAR
 	+INVENTORY.PICKUPFLASH
 	+INVENTORY.FANCYPICKUPSOUND
@@ -85,6 +86,7 @@ ACTOR ArtiPork : CustomInventory 30
 	SpawnID 14
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.INVBAR
 	+INVENTORY.PICKUPFLASH
 	+INVENTORY.FANCYPICKUPSOUND

diff --git a/wadsrc/static/actors/raven/artitele.txt b/wadsrc/static/actors/raven/artitele.txt
@@ -7,6 +7,7 @@ ACTOR ArtiTeleport : Inventory 36 native
 	SpawnID 18
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.INVBAR
 	+INVENTORY.PICKUPFLASH
 	+INVENTORY.FANCYPICKUPSOUND

diff --git a/wadsrc/static/actors/raven/ravenartifacts.txt b/wadsrc/static/actors/raven/ravenartifacts.txt
@@ -8,6 +8,7 @@ ACTOR ArtiHealth : HealthPickup 82
 	Health 25
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	+INVENTORY.FANCYPICKUPSOUND
 	Inventory.Icon ARTIPTN2
@@ -32,6 +33,7 @@ ACTOR ArtiSuperHealth : HealthPickup 32
 	Health 100
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	+INVENTORY.FANCYPICKUPSOUND
 	Inventory.Icon ARTISPHL
@@ -55,6 +57,7 @@ ACTOR ArtiFly : PowerupGiver 83
 	SpawnID 15
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	+INVENTORY.INTERHUBSTRIP
 	Inventory.RespawnTics 4230
@@ -78,6 +81,7 @@ ACTOR ArtiInvulnerability : PowerupGiver 84
 	SpawnID 133
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	Inventory.RespawnTics 4230
 	Inventory.Icon ARTIINVU
@@ -101,6 +105,7 @@ ACTOR ArtiInvulnerability2 : PowerupGiver 84
 	SpawnID 133
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	Inventory.RespawnTics 4230
 	Inventory.Icon ARTIDEFN
@@ -123,6 +128,7 @@ ACTOR ArtiTorch : PowerupGiver 33
 	SpawnID 73
 	+COUNTITEM
 	+FLOATBOB
+	+NOGRAVITY
 	+INVENTORY.PICKUPFLASH
 	Inventory.Icon ARTITRCH
 	Inventory.PickupMessage "$TXT_ARTITORCH"

diff --git a/wadsrc/static/actors/raven/ravenhealth.txt b/wadsrc/static/actors/raven/ravenhealth.txt
@@ -3,6 +3,7 @@ ACTOR CrystalVial : Health 81
 	Game Raven
 	SpawnID 23
 	+FLOATBOB
+	+NOGRAVITY
 	Inventory.Amount 10
 	Inventory.PickupMessage "$TXT_ITEMHEALTH"
 	States