zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 07:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2013-11-20 09:16:12 +01:00
commit 4122e4041a
22 changed files with 45 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/CMakeLists.txt
View file

@ -144,6 +144,11 @@ if( WIN32 )
ws2_32 ws2_32
setupapi setupapi
oleaut32 ) oleaut32 )
# For some reason this isn't implied on 2005
if( MSVC80 )
set( ZDOOM_LIBS ${ZDOOM_LIBS} DelayImp )
endif( MSVC80 )
else( WIN32 ) else( WIN32 )
if( APPLE ) if( APPLE )
set( FMOD_SEARCH_PATHS "/Developer/FMOD Programmers API Mac/api" ) set( FMOD_SEARCH_PATHS "/Developer/FMOD Programmers API Mac/api" )
@ -1211,7 +1216,11 @@ endif( NOT ZDOOM_OUTPUT_OLDSTYLE OR NO_GENERATOR_EXPRESSIONS )
if( MSVC ) if( MSVC )
option( ZDOOM_GENERATE_MAPFILE "Generate .map file for debugging." OFF ) option( ZDOOM_GENERATE_MAPFILE "Generate .map file for debugging." OFF )
if( ZDOOM_GENERATE_MAPFILE ) if( ZDOOM_GENERATE_MAPFILE )
if( NOT MSVC80 )
set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\" /MAP:${ZDOOM_EXE_NAME}.map") 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 ) else( ZDOOM_GENERATE_MAPFILE )
set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\"") set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\"")
endif( ZDOOM_GENERATE_MAPFILE ) endif( ZDOOM_GENERATE_MAPFILE )

2
src/g_game.cpp
View file

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

13
src/p_conversation.cpp
View file

@ -522,19 +522,8 @@ static void ParseReplies (FStrifeDialogueReply **replyptr, Response *responses)
// If the first item check has a positive amount required, then // If the first item check has a positive amount required, then
// add that to the reply string. Otherwise, use the reply as-is. // 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->Reply = copystring (rsp->Reply);
reply->NeedsGold = false; reply->NeedsGold = (rsp->Count[0] > 0);
}
// QuickYes messages are shown when you meet the item checks. // QuickYes messages are shown when you meet the item checks.
// QuickNo messages are shown when you don't. // QuickNo messages are shown when you don't.

1
wadsrc/static/actors/heretic/hereticammo.txt
View file

@ -221,6 +221,7 @@ ACTOR BagOfHolding : BackpackItem 8
Inventory.PickupMessage "$TXT_ITEMBAGOFHOLDING" Inventory.PickupMessage "$TXT_ITEMBAGOFHOLDING"
+COUNTITEM +COUNTITEM
+FLOATBOB +FLOATBOB
+NOGRAVITY
States States
{ {
Spawn: Spawn:

2
wadsrc/static/actors/heretic/hereticarmor.txt
View file

@ -6,6 +6,7 @@ Actor SilverShield : BasicArmorPickup 85
Game Heretic Game Heretic
SpawnID 68 SpawnID 68
+FLOATBOB +FLOATBOB
+NOGRAVITY
Inventory.Pickupmessage "$TXT_ITEMSHIELD1" Inventory.Pickupmessage "$TXT_ITEMSHIELD1"
Inventory.Icon "SHLDA0" Inventory.Icon "SHLDA0"
Armor.Savepercent 50 Armor.Savepercent 50
@ -25,6 +26,7 @@ Actor EnchantedShield : BasicArmorPickup 31
Game Heretic Game Heretic
SpawnID 69 SpawnID 69
+FLOATBOB +FLOATBOB
+NOGRAVITY
Inventory.Pickupmessage "$TXT_ITEMSHIELD2" Inventory.Pickupmessage "$TXT_ITEMSHIELD2"
Inventory.Icon "SHD2A0" Inventory.Icon "SHD2A0"
Armor.Savepercent 75 Armor.Savepercent 75

4
wadsrc/static/actors/heretic/hereticartifacts.txt
View file

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

1
wadsrc/static/actors/hexen/blastradius.txt
View file

@ -4,6 +4,7 @@ ACTOR ArtiBlastRadius : CustomInventory 10110
Game Hexen Game Hexen
SpawnID 74 SpawnID 74
+FLOATBOB +FLOATBOB
+NOGRAVITY
Inventory.DefMaxAmount Inventory.DefMaxAmount
Inventory.PickupFlash "PickupFlash" Inventory.PickupFlash "PickupFlash"
+INVBAR +FANCYPICKUPSOUND +INVBAR +FANCYPICKUPSOUND

1
wadsrc/static/actors/hexen/boostarmor.txt
View file

@ -7,6 +7,7 @@ ACTOR ArtiBoostArmor : Inventory 8041 native
SpawnID 22 SpawnID 22
+COUNTITEM +COUNTITEM
+FLOATBOB +FLOATBOB
+NOGRAVITY
Inventory.DefMaxAmount Inventory.DefMaxAmount
Inventory.PickupFlash "PickupFlash" Inventory.PickupFlash "PickupFlash"
+INVBAR +FANCYPICKUPSOUND +INVBAR +FANCYPICKUPSOUND

1
wadsrc/static/actors/hexen/clericholy.txt
View file

@ -8,6 +8,7 @@ ACTOR ClericWeaponPiece : WeaponPiece
Inventory.ForbiddenTo FighterPlayer, MagePlayer Inventory.ForbiddenTo FighterPlayer, MagePlayer
WeaponPiece.Weapon CWeapWraithverge WeaponPiece.Weapon CWeapWraithverge
+FLOATBOB +FLOATBOB
+NOGRAVITY
} }
// Cleric Weapon Piece 1 ---------------------------------------------------- // Cleric Weapon Piece 1 ----------------------------------------------------

1
wadsrc/static/actors/hexen/fighterquietus.txt
View file

@ -8,6 +8,7 @@ ACTOR FighterWeaponPiece : WeaponPiece
Inventory.ForbiddenTo ClericPlayer, MagePlayer Inventory.ForbiddenTo ClericPlayer, MagePlayer
WeaponPiece.Weapon FWeapQuietus WeaponPiece.Weapon FWeapQuietus
+FLOATBOB +FLOATBOB
+NOGRAVITY
} }
// Fighter Weapon Piece 1 --------------------------------------------------- // Fighter Weapon Piece 1 ---------------------------------------------------

1
wadsrc/static/actors/hexen/flechette.txt
View file

@ -99,6 +99,7 @@ ACTOR ArtiPoisonBag : Inventory 8000 native
Game Hexen Game Hexen
SpawnID 72 SpawnID 72
+FLOATBOB +FLOATBOB
+NOGRAVITY
Inventory.DefMaxAmount Inventory.DefMaxAmount
Inventory.PickupFlash "PickupFlash" Inventory.PickupFlash "PickupFlash"
+INVBAR +FANCYPICKUPSOUND +INVBAR +FANCYPICKUPSOUND

1
wadsrc/static/actors/hexen/fog.txt
View file

@ -6,6 +6,7 @@ ACTOR FogSpawner 10000
Game Hexen Game Hexen
+NOSECTOR +NOBLOCKMAP +NOSECTOR +NOBLOCKMAP
+FLOATBOB +FLOATBOB
+NOGRAVITY
+INVISIBLE +INVISIBLE
action native A_FogSpawn(); action native A_FogSpawn();

1
wadsrc/static/actors/hexen/healingradius.txt
View file

@ -6,6 +6,7 @@ ACTOR ArtiHealingRadius : Inventory 10120 native
Game Hexen Game Hexen
+COUNTITEM +COUNTITEM
+FLOATBOB +FLOATBOB
+NOGRAVITY
Inventory.DefMaxAmount Inventory.DefMaxAmount
+INVENTORY.INVBAR +INVENTORY.INVBAR
+INVENTORY.PICKUPFLASH +INVENTORY.PICKUPFLASH

1
wadsrc/static/actors/hexen/magestaff.txt
View file

@ -8,6 +8,7 @@ ACTOR MageWeaponPiece : WeaponPiece
Inventory.ForbiddenTo FighterPlayer, ClericPlayer Inventory.ForbiddenTo FighterPlayer, ClericPlayer
WeaponPiece.Weapon MWeapBloodscourge WeaponPiece.Weapon MWeapBloodscourge
+FLOATBOB +FLOATBOB
+NOGRAVITY
} }
// Mage Weapon Piece 1 ------------------------------------------------------ // Mage Weapon Piece 1 ------------------------------------------------------

4
wadsrc/static/actors/hexen/mana.txt
View file

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

1
wadsrc/static/actors/hexen/speedboots.txt
View file

@ -5,6 +5,7 @@ ACTOR ArtiSpeedBoots : PowerupGiver 8002
Game Hexen Game Hexen
SpawnID 13 SpawnID 13
+FLOATBOB +FLOATBOB
+NOGRAVITY
+COUNTITEM +COUNTITEM
+INVENTORY.PICKUPFLASH +INVENTORY.PICKUPFLASH
Inventory.Icon ARTISPED Inventory.Icon ARTISPED

1
wadsrc/static/actors/hexen/summon.txt
View file

@ -7,6 +7,7 @@ ACTOR ArtiDarkServant : Inventory 86 native
SpawnID 16 SpawnID 16
+COUNTITEM +COUNTITEM
+FLOATBOB +FLOATBOB
+NOGRAVITY
Inventory.RespawnTics 4230 Inventory.RespawnTics 4230
Inventory.DefMaxAmount Inventory.DefMaxAmount
Inventory.PickupFlash "PickupFlash" Inventory.PickupFlash "PickupFlash"

1
wadsrc/static/actors/hexen/teleportother.txt
View file

@ -7,6 +7,7 @@ ACTOR ArtiTeleportOther : Inventory 10040 native
SpawnID 17 SpawnID 17
+COUNTITEM +COUNTITEM
+FLOATBOB +FLOATBOB
+NOGRAVITY
+INVENTORY.INVBAR +INVENTORY.INVBAR
+INVENTORY.PICKUPFLASH +INVENTORY.PICKUPFLASH
+INVENTORY.FANCYPICKUPSOUND +INVENTORY.FANCYPICKUPSOUND

2
wadsrc/static/actors/raven/artiegg.txt
View file

@ -31,6 +31,7 @@ ACTOR ArtiEgg : CustomInventory 30
SpawnID 14 SpawnID 14
+COUNTITEM +COUNTITEM
+FLOATBOB +FLOATBOB
+NOGRAVITY
+INVENTORY.INVBAR +INVENTORY.INVBAR
+INVENTORY.PICKUPFLASH +INVENTORY.PICKUPFLASH
+INVENTORY.FANCYPICKUPSOUND +INVENTORY.FANCYPICKUPSOUND
@ -85,6 +86,7 @@ ACTOR ArtiPork : CustomInventory 30
SpawnID 14 SpawnID 14
+COUNTITEM +COUNTITEM
+FLOATBOB +FLOATBOB
+NOGRAVITY
+INVENTORY.INVBAR +INVENTORY.INVBAR
+INVENTORY.PICKUPFLASH +INVENTORY.PICKUPFLASH
+INVENTORY.FANCYPICKUPSOUND +INVENTORY.FANCYPICKUPSOUND

1
wadsrc/static/actors/raven/artitele.txt
View file

@ -7,6 +7,7 @@ ACTOR ArtiTeleport : Inventory 36 native
SpawnID 18 SpawnID 18
+COUNTITEM +COUNTITEM
+FLOATBOB +FLOATBOB
+NOGRAVITY
+INVENTORY.INVBAR +INVENTORY.INVBAR
+INVENTORY.PICKUPFLASH +INVENTORY.PICKUPFLASH
+INVENTORY.FANCYPICKUPSOUND +INVENTORY.FANCYPICKUPSOUND

6
wadsrc/static/actors/raven/ravenartifacts.txt
View file

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

1
wadsrc/static/actors/raven/ravenhealth.txt
View file

@ -3,6 +3,7 @@ ACTOR CrystalVial : Health 81
Game Raven Game Raven
SpawnID 23 SpawnID 23
+FLOATBOB +FLOATBOB
+NOGRAVITY
Inventory.Amount 10 Inventory.Amount 10
Inventory.PickupMessage "$TXT_ITEMHEALTH" Inventory.PickupMessage "$TXT_ITEMHEALTH"
States States