zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-27 20:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added game flags for all supported add-ons.

Browse source
This commit is contained in:
Christoph Oelckers 2021-04-26 01:24:57 +02:00
parent 88dfb93865
commit 21aa5c9234
5 changed files with 39 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/core/gamecontrol.h
View file

@ -99,8 +99,15 @@ enum
GAMEFLAG_POWERSLAVE = 0x00002000, GAMEFLAG_POWERSLAVE = 0x00002000,
GAMEFLAG_EXHUMED = 0x00004000, GAMEFLAG_EXHUMED = 0x00004000,
GAMEFLAG_PSEXHUMED = GAMEFLAG_POWERSLAVE | GAMEFLAG_EXHUMED, // the two games really are the same, except for the name and the publisher. GAMEFLAG_PSEXHUMED = GAMEFLAG_POWERSLAVE | GAMEFLAG_EXHUMED, // the two games really are the same, except for the name and the publisher.
GAMEFLAG_WORLDTOUR = 0x00008000, GAMEFLAG_WORLDTOUR = 0x00008000,
GAMEFLAG_DUKEDC = 0x00010000, GAMEFLAG_DUKEDC = 0x00010000,
GAMEFLAG_DUKENW = 0x00020000,
GAMEFLAG_DUKEVACA = 0x00040000,
GAMEFLAG_BLOODCP = 0x00080000,
GAMEFLAG_ROUTE66 = 0x00100000,
GAMEFLAG_SWWANTON = 0x00200000,
GAMEFLAG_SWTWINDRAG = 0x00400000,
GAMEFLAG_DUKECOMPAT = GAMEFLAG_DUKE | GAMEFLAG_NAM | GAMEFLAG_NAPALM | GAMEFLAG_WW2GI | GAMEFLAG_RRALL, GAMEFLAG_DUKECOMPAT = GAMEFLAG_DUKE | GAMEFLAG_NAM | GAMEFLAG_NAPALM | GAMEFLAG_WW2GI | GAMEFLAG_RRALL,
GAMEFLAGMASK = 0x0000FFFF, // flags allowed from grpinfo GAMEFLAGMASK = 0x0000FFFF, // flags allowed from grpinfo

6
source/core/searchpaths.cpp
View file

@ -398,6 +398,12 @@ static TArray<GrpInfo> ParseGrpInfo(const char *fn, FileReader &fr, TMap<FString
FlagMap.Insert("GAMEFLAG_POWERSLAVE", GAMEFLAG_POWERSLAVE); FlagMap.Insert("GAMEFLAG_POWERSLAVE", GAMEFLAG_POWERSLAVE);
FlagMap.Insert("GAMEFLAG_EXHUMED", GAMEFLAG_EXHUMED); FlagMap.Insert("GAMEFLAG_EXHUMED", GAMEFLAG_EXHUMED);
FlagMap.Insert("GAMEFLAG_DUKEDC", GAMEFLAG_DUKEDC); FlagMap.Insert("GAMEFLAG_DUKEDC", GAMEFLAG_DUKEDC);
FlagMap.Insert("GAMEFLAG_DUKENW", GAMEFLAG_DUKENW);
FlagMap.Insert("GAMEFLAG_DUKEVACA", GAMEFLAG_DUKEVACA);
FlagMap.Insert("GAMEFLAG_BLOODCP", GAMEFLAG_BLOODCP);
FlagMap.Insert("GAMEFLAG_ROUTE66", GAMEFLAG_ROUTE66);
FlagMap.Insert("GAMEFLAG_SWWANTON", GAMEFLAG_SWWANTON);
FlagMap.Insert("GAMEFLAG_SWTWINDRAG", GAMEFLAG_SWTWINDRAG);
FScanner sc; FScanner sc;
auto mem = fr.Read(); auto mem = fr.Read();

17
source/games/duke/src/2d_r.cpp
View file

@ -285,23 +285,6 @@ void dobonus_r(int bonusonly, const CompletionFunc& completion)
} }
#if 0
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void loadscreen_r(MapRecord* rec, CompletionFunc func)
{
TArray<DScreenJob*> jobs(1, true);
jobs[0] = Create<DRRLoadScreen>(rec);
RunScreenJob(jobs, func);
}
#endif
void PrintPaused_r() void PrintPaused_r()
{ {
BigText(160, 100, GStrings("Game Paused"), 0); BigText(160, 100, GStrings("Game Paused"), 0);

32
wadsrc/static/engine/grpinfo.txt
View file

@ -249,7 +249,7 @@ grpinfo
name "Duke Caribbean: Life's a Beach" name "Duke Caribbean: Life's a Beach"
size 22213819 size 22213819
crc DUKECB_CRC crc DUKECB_CRC
flags GAMEFLAG_DUKE|GAMEFLAG_ADDON flags GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_DUKEVACA
dependency DUKE15_CRC dependency DUKE15_CRC
gamefilter "Duke.Vacation" gamefilter "Duke.Vacation"
FgColor 0x00004f FgColor 0x00004f
@ -263,7 +263,7 @@ grpinfo
scriptname "VACATION.CON" scriptname "VACATION.CON"
size 22397273 size 22397273
crc 0x65B5F690 crc 0x65B5F690
flags GAMEFLAG_DUKE|GAMEFLAG_ADDON flags GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_DUKEVACA
dependency DUKE15_CRC dependency DUKE15_CRC
gamefilter "Duke.Vacation" gamefilter "Duke.Vacation"
FgColor 0x00004f FgColor 0x00004f
@ -277,7 +277,7 @@ grpinfo
scriptname "NWINTER.CON" scriptname "NWINTER.CON"
size 16169365 size 16169365
crc DUKENW_CRC crc DUKENW_CRC
flags GAMEFLAG_DUKE|GAMEFLAG_ADDON flags GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_DUKENW
dependency DUKE15_CRC dependency DUKE15_CRC
gamefilter "Duke.NWinter" gamefilter "Duke.NWinter"
FgColor 0 FgColor 0
@ -291,7 +291,7 @@ grpinfo
scriptname "NWINTER.CON" scriptname "NWINTER.CON"
size 10965909 size 10965909
crc 0xC7EFBFA9 crc 0xC7EFBFA9
flags GAMEFLAG_DUKE|GAMEFLAG_ADDON flags GAMEFLAG_DUKE|GAMEFLAG_ADDON|GAMEFLAG_DUKENW
dependency DUKE15_CRC dependency DUKE15_CRC
gamefilter "Duke.NWinter" gamefilter "Duke.NWinter"
FgColor 0 FgColor 0
@ -423,7 +423,7 @@ grpinfo
name "BLOOD: Cryptic Passage" name "BLOOD: Cryptic Passage"
scriptname "CRYPTIC.INI" scriptname "CRYPTIC.INI"
mustcontain "CRYPTIC.INI", "CP01.MAP", "CP02.MAP" mustcontain "CRYPTIC.INI", "CP01.MAP", "CP02.MAP"
flags GAMEFLAG_BLOOD|GAMEFLAG_ADDON flags GAMEFLAG_BLOOD|GAMEFLAG_ADDON|GAMEFLAG_BLOODCP
dependency BLOOD_CRC dependency BLOOD_CRC
loadart "CPART07.AR_", "CPART15.AR_" loadart "CPART07.AR_", "CPART15.AR_"
gamefilter "Blood.Cryptic" gamefilter "Blood.Cryptic"
@ -436,7 +436,7 @@ addon
name "BLOOD: Cryptic Passage" name "BLOOD: Cryptic Passage"
scriptname "CRYPTIC.INI" scriptname "CRYPTIC.INI"
mustcontain "CRYPTIC.INI", "CP01.MAP", "CP02.MAP" mustcontain "CRYPTIC.INI", "CP01.MAP", "CP02.MAP"
flags GAMEFLAG_BLOOD|GAMEFLAG_ADDON flags GAMEFLAG_BLOOD|GAMEFLAG_ADDON|GAMEFLAG_BLOODCP
dependency BLOOD_CRC dependency BLOOD_CRC
loadart "CPART07.AR_", "CPART15.AR_" loadart "CPART07.AR_", "CPART15.AR_"
gamefilter "Blood.Cryptic" gamefilter "Blood.Cryptic"
@ -450,7 +450,7 @@ addon
scriptname "CRYPTIC.INI" scriptname "CRYPTIC.INI"
mustcontain "cryptic/CRYPTIC.INI", "cryptic/CP01.MAP", "cryptic/CP02.MAP" mustcontain "cryptic/CRYPTIC.INI", "cryptic/CP01.MAP", "cryptic/CP02.MAP"
loadgrp "cryptic" loadgrp "cryptic"
flags GAMEFLAG_BLOOD|GAMEFLAG_ADDON flags GAMEFLAG_BLOOD|GAMEFLAG_ADDON|GAMEFLAG_BLOODCP
dependency BLOOD_CRC dependency BLOOD_CRC
loadart "CPART07.AR_", "CPART15.AR_" loadart "CPART07.AR_", "CPART15.AR_"
gamefilter "Blood.Cryptic" gamefilter "Blood.Cryptic"
@ -464,7 +464,7 @@ addon
scriptname "CRYPTIC.INI" scriptname "CRYPTIC.INI"
mustcontain "addons/Cryptic Passage/CRYPTIC.INI", "addons/Cryptic Passage/CP01.MAP", "addons/Cryptic Passage/CP02.MAP" mustcontain "addons/Cryptic Passage/CRYPTIC.INI", "addons/Cryptic Passage/CP01.MAP", "addons/Cryptic Passage/CP02.MAP"
loadgrp "addons/Cryptic Passage" loadgrp "addons/Cryptic Passage"
flags GAMEFLAG_BLOOD|GAMEFLAG_ADDON flags GAMEFLAG_BLOOD|GAMEFLAG_ADDON|GAMEFLAG_BLOODCP
dependency BLOOD_CRC dependency BLOOD_CRC
gamefilter "Blood.Cryptic" gamefilter "Blood.Cryptic"
GameID "CrypticPassage" GameID "CrypticPassage"
@ -573,7 +573,7 @@ grpinfo
grpinfo grpinfo
{ {
name "Shadow Warrior: Wanton Destruction" name "Shadow Warrior: Wanton Destruction"
flags GAMEFLAG_SW|GAMEFLAG_ADDON flags GAMEFLAG_SW|GAMEFLAG_ADDON|GAMEFLAG_SWWANTON
crc SWWD_CRC crc SWWD_CRC
size 48698128 size 48698128
defname "sw.def" defname "sw.def"
@ -585,7 +585,7 @@ grpinfo
grpinfo grpinfo
{ {
name "Shadow Warrior: Wanton Destruction" name "Shadow Warrior: Wanton Destruction"
flags GAMEFLAG_SW|GAMEFLAG_ADDON flags GAMEFLAG_SW|GAMEFLAG_ADDON|GAMEFLAG_SWWANTON
crc 0x8B6E8011 crc 0x8B6E8011
size 48698128 size 48698128
defname "sw.def" defname "sw.def"
@ -597,7 +597,7 @@ grpinfo
grpinfo grpinfo
{ {
name "Shadow Warrior: Wanton Destruction (ProAsm)" name "Shadow Warrior: Wanton Destruction (ProAsm)"
flags GAMEFLAG_SW|GAMEFLAG_ADDON flags GAMEFLAG_SW|GAMEFLAG_ADDON|GAMEFLAG_SWWANTON
crc 0x39893EF4 crc 0x39893EF4
size 9562689 size 9562689
defname "sw.def" defname "sw.def"
@ -610,7 +610,7 @@ grpinfo
grpinfo grpinfo
{ {
name "Shadow Warrior: Twin Dragon" name "Shadow Warrior: Twin Dragon"
flags GAMEFLAG_SW|GAMEFLAG_ADDON flags GAMEFLAG_SW|GAMEFLAG_ADDON|GAMEFLAG_SWTWINDRAG
crc SWTD_CRC crc SWTD_CRC
size 12499012 size 12499012
defname "twindrag.def" defname "twindrag.def"
@ -623,7 +623,7 @@ grpinfo
grpinfo grpinfo
{ {
name "Shadow Warrior: Twin Dragon" name "Shadow Warrior: Twin Dragon"
flags GAMEFLAG_SW|GAMEFLAG_ADDON flags GAMEFLAG_SW|GAMEFLAG_ADDON|GAMEFLAG_SWTWINDRAG
crc 0xB5B71277 crc 0xB5B71277
size 6236287 size 6236287
defname "twindrag.def" defname "twindrag.def"
@ -635,7 +635,7 @@ grpinfo
grpinfo grpinfo
{ {
name "Shadow Warrior: Twin Dragon" name "Shadow Warrior: Twin Dragon"
flags GAMEFLAG_SW|GAMEFLAG_ADDON flags GAMEFLAG_SW|GAMEFLAG_ADDON|GAMEFLAG_SWTWINDRAG
crc 0xACC8DCDE crc 0xACC8DCDE
size 6235578 size 6235578
defname "twindrag.def" defname "twindrag.def"
@ -678,7 +678,7 @@ grpinfo
name "Redneck Rampage: Suckin' Grits on Route 66" name "Redneck Rampage: Suckin' Grits on Route 66"
scriptname "GAME66.CON" scriptname "GAME66.CON"
mustcontain "TILESA66.ART", "TILESB66.ART", "ROUTE66/CARNIVAL.MAP", "ROUTE66/TRUCKSTP.MAP", "GAME66.CON" mustcontain "TILESA66.ART", "TILESB66.ART", "ROUTE66/CARNIVAL.MAP", "ROUTE66/TRUCKSTP.MAP", "GAME66.CON"
flags GAMEFLAG_RR|GAMEFLAG_ADDON flags GAMEFLAG_RR|GAMEFLAG_ADDON|GAMEFLAG_ROUTE66
dependency RR_CRC dependency RR_CRC
loadart "TILESA66.ART", "TILESB66.ART" // replaces TILES009 and TILES023. loadart "TILESA66.ART", "TILESB66.ART" // replaces TILES009 and TILES023.
gamefilter "Redneck.Route66" gamefilter "Redneck.Route66"
@ -692,7 +692,7 @@ addon
name "Redneck Rampage: Suckin' Grits on Route 66" name "Redneck Rampage: Suckin' Grits on Route 66"
scriptname "GAME66.CON" scriptname "GAME66.CON"
mustcontain "TILESA66.ART", "TILESB66.ART", "ROUTE66/CARNIVAL.MAP", "ROUTE66/TRUCKSTP.MAP", "GAME66.CON" mustcontain "TILESA66.ART", "TILESB66.ART", "ROUTE66/CARNIVAL.MAP", "ROUTE66/TRUCKSTP.MAP", "GAME66.CON"
flags GAMEFLAG_RR|GAMEFLAG_ADDON flags GAMEFLAG_RR|GAMEFLAG_ADDON|GAMEFLAG_ROUTE66
dependency RR_CRC dependency RR_CRC
loadart "TILESA66.ART", "TILESB66.ART" // replaces TILES009 and TILES023. loadart "TILESA66.ART", "TILESB66.ART" // replaces TILES009 and TILES023.
gamefilter "Redneck.Route66" gamefilter "Redneck.Route66"

10
wadsrc/static/zscript/razebase.zs
View file

@ -17,8 +17,14 @@ enum EGameType
GAMEFLAG_POWERSLAVE = 0x00002000, GAMEFLAG_POWERSLAVE = 0x00002000,
GAMEFLAG_EXHUMED = 0x00004000, GAMEFLAG_EXHUMED = 0x00004000,
GAMEFLAG_PSEXHUMED = GAMEFLAG_POWERSLAVE | GAMEFLAG_EXHUMED, // the two games really are the same, except for the name and the publisher. GAMEFLAG_PSEXHUMED = GAMEFLAG_POWERSLAVE | GAMEFLAG_EXHUMED, // the two games really are the same, except for the name and the publisher.
GAMEFLAG_WORLDTOUR = 0x00008000, GAMEFLAG_WORLDTOUR = 0x00008000,
GAMEFLAG_DUKEDC = 0x00010000, GAMEFLAG_DUKEDC = 0x00010000,
GAMEFLAG_DUKENW = 0x00020000,
GAMEFLAG_DUKEVACA = 0x00040000,
GAMEFLAG_BLOODCP = 0x00080000,
GAMEFLAG_ROUTE66 = 0x00100000,
GAMEFLAG_SWWANTON = 0x00200000,
GAMEFLAG_SWTWINDRAG = 0x00400000,
GAMEFLAGMASK = 0x0000FFFF, // flags allowed from grpinfo GAMEFLAGMASK = 0x0000FFFF, // flags allowed from grpinfo
// We still need these for the parsers. // We still need these for the parsers.