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

Temporarily revert r6633.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6639 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-01-31 05:23:43 +00:00
parent d2fd7a2c30
commit 190d71832a
4 changed files with 20 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
source/duke3d/src/_functio.h
View file

@ -46,7 +46,7 @@ char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] =
"Fire", "Fire",
"Open", "Open",
"Run", "Run",
"Run_Mode", "AutoRun",
"Jump", "Jump",
"Crouch", "Crouch",
"Look_Up", "Look_Up",
@ -57,18 +57,6 @@ char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] =
"Strafe_Right", "Strafe_Right",
"Aim_Up", "Aim_Up",
"Aim_Down", "Aim_Down",
#ifndef EDUKE32_STANDALONE
"Mighty Foot",
"Pistol",
"Shotgun",
"Ripper",
"RPG",
"Pipebomb",
"Shrinker", // if v1.4 redefine to "Shrinker/Expander" in CONFIG_SetDefaults
"Devastator",
"Laser_Tripbomb",
"Freezer",
#else
"Weapon_1", "Weapon_1",
"Weapon_2", "Weapon_2",
"Weapon_3", "Weapon_3",
@ -79,47 +67,46 @@ char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] =
"Weapon_8", "Weapon_8",
"Weapon_9", "Weapon_9",
"Weapon_10", "Weapon_10",
#endif "Inventory",
"Use_Inventory",
"Inventory_Left", "Inventory_Left",
"Inventory_Right", "Inventory_Right",
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
"Holoduke", "Holo_Duke",
"Jetpack", "Jetpack",
"Night_Vision_Goggles", "NightVision",
"Portable_Medkit", "MedKit",
#else #else
"Inventory_3", "",
"Inventory_4", "",
"Inventory_5", "",
"Inventory_1", "",
#endif #endif
"Turn_Around", "TurnAround",
"Send_Message", "SendMessage",
"Map", "Map",
"Shrink_Screen", "Shrink_Screen",
"Enlarge_Screen", "Enlarge_Screen",
"Center_View", "Center_View",
"Holster_Weapon", "Holster_Weapon",
"Show_Weapon_Indicator", "Show_Opponents_Weapon",
"Map_Follow_Mode", "Map_Follow_Mode",
"Show_Peer_View", "See_Coop_View",
"Mouse_Aiming", "Mouse_Aiming",
"Toggle_Crosshair", "Toggle_Crosshair",
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
"Steroids", "Steroids",
"Quick_Kick", "Quick_Kick",
#else #else
"Inventory_2", "",
"Melee_Attack", "",
#endif #endif
"Next_Weapon", "Next_Weapon",
"Previous_Weapon", "Previous_Weapon",
"Show_Console", "Show_Console",
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
"Show_Dukematch_Scores", "Show_DukeMatch_Scores",
#else #else
"Show_Deathmatch_Scores", "Show_Multiplayer_Scores",
#endif #endif
"Dpad_Select", "Dpad_Select",
"Dpad_Aiming", "Dpad_Aiming",

4
source/duke3d/src/cheats.cpp
View file

@ -188,8 +188,8 @@ void G_SetupCheats(void)
Bstrcpy(CheatStrings[24], "adebug"); Bstrcpy(CheatStrings[24], "adebug");
Bstrcpy(CheatStrings[26], "acgs"); Bstrcpy(CheatStrings[26], "acgs");
Bstrcpy(g_gametypeNames[0], "Gruntmatch (Spawn)"); Bstrcpy(g_gametypeNames[0], "GruntMatch (Spawn)");
Bstrcpy(g_gametypeNames[2], "Gruntmatch (No Spawn)"); Bstrcpy(g_gametypeNames[2], "GruntMatch (No Spawn)");
} }
} }
#endif #endif

22
source/duke3d/src/config.cpp
View file

@ -281,28 +281,6 @@ void CONFIG_SetDefaults(void)
// JBF 20031211 // JBF 20031211
CONFIG_SetDefaultKeys(keydefaults); CONFIG_SetDefaultKeys(keydefaults);
if (PLUTOPAK)
strcpy(gamefunctions[gamefunc_Weapon_7], "Shrinker/Expander");
// Caribbean
#if 0
{
strcpy(gamefunctions[gamefunc_Weapon_1], "Sandal_Foot");
strcpy(gamefunctions[gamefunc_Weapon_2], "Squirt_Gun");
strcpy(gamefunctions[gamefunc_Weapon_3], "Super_Soak'em");
strcpy(gamefunctions[gamefunc_Weapon_4], "Triple_Poison_Shooter");
strcpy(gamefunctions[gamefunc_Weapon_5], "Coconut_Launcher");
strcpy(gamefunctions[gamefunc_Weapon_6], "Pineapple");
strcpy(gamefunctions[gamefunc_Weapon_7], "Voodoo_Ring");
strcpy(gamefunctions[gamefunc_Weapon_8], "Conchanator");
strcpy(gamefunctions[gamefunc_Weapon_9], "Voodoo_Tripbomb");
strcpy(gamefunctions[gamefunc_Weapon_10], "Ice_Crusher");
strcpy(gamefunctions[gamefunc_NightVision], "Sunglasses");
strcpy(gamefunctions[gamefunc_MedKit], "Crate_of_Bananas");
strcpy(gamefunctions[gamefunc_Steroids], "Hot_Sauce");
}
#endif
// TODO: NAM, WWII GI
memset(ud.config.MouseFunctions, -1, sizeof(ud.config.MouseFunctions)); memset(ud.config.MouseFunctions, -1, sizeof(ud.config.MouseFunctions));
for (i=0; i<MAXMOUSEBUTTONS; i++) for (i=0; i<MAXMOUSEBUTTONS; i++)

2
source/duke3d/src/global.cpp
View file

@ -36,7 +36,7 @@ extern "C" {
char g_volumeNames[MAXVOLUMES][33] = { "L.A. Meltdown", "Lunar Apocalypse", "Shrapnel City" }; char g_volumeNames[MAXVOLUMES][33] = { "L.A. Meltdown", "Lunar Apocalypse", "Shrapnel City" };
char g_skillNames[MAXSKILLS][33] = { "Piece Of Cake", "Let's Rock", "Come Get Some", "Damn I'm Good" }; char g_skillNames[MAXSKILLS][33] = { "Piece Of Cake", "Let's Rock", "Come Get Some", "Damn I'm Good" };
char g_gametypeNames[MAXGAMETYPES][33] char g_gametypeNames[MAXGAMETYPES][33]
= { "Dukematch (Spawn)", "Cooperative Play", "Dukematch (No Spawn)", "Team DM (Spawn)", "Team DM (No Spawn)" }; = { "DukeMatch (Spawn)", "Cooperative Play", "DukeMatch (No Spawn)", "Team DM (Spawn)", "Team DM (No Spawn)" };
#else #else
char g_volumeNames[MAXVOLUMES][33]; char g_volumeNames[MAXVOLUMES][33];
char g_skillNames[MAXSKILLS][33]; char g_skillNames[MAXSKILLS][33];