1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- UB Improvements / Cleanup (by Jazz)

Browse Source 
o Now there are 2 ways to play UB (1.13 and Vanilla): vfs_config.UB113.ini, vfs_config.UBVanilla.ini
o UB: Source Code cleanup: Replaced hardcoded merc profiles with proper ENUMS, ...
o Updated / added UB-Config values


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-08-28 17:06:43 +00:00
parent ee8d4f6eb9
commit a5abf4d91a
23 changed files with 255 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ub_config.cpp
+47 -1
View File
@@ -69,6 +69,7 @@
#ifdef JA2UB
#include "Ja25 Strategic Ai.h"
#include "Ja25_Tactical.h"
#include "Ja25Update.h"
#endif
@@ -290,4 +291,49 @@ void LoadGameUBOptions()
gGameUBOptions.LaptopLinkFuneral = iniReader.ReadBoolean("Laptop Settings","LINK_FUNERAL", TRUE);
gGameUBOptions.LaptopLinkBobby = iniReader.ReadBoolean("Laptop Settings","LINK_BOBBY", FALSE);
gGameUBOptions.fBobbyRSite = iniReader.ReadBoolean("Laptop Settings","BOBBY_SITE_ACCESSED", FALSE);
}
// -----------------------
// Weapon
// -----------------------
#ifdef JA2UB
TEX_MOVIE_ATTACK_CLYDESDALES = iniReader.ReadInteger("Unfinished Business Items","TEX_MOVIE_ATTACK_CLYDESDALES", 1356);
TEX_MOVIE_WILD_EAST = iniReader.ReadInteger("Unfinished Business Items","TEX_MOVIE_WILD_EAST", 1357);
TEX_MOVIE_HAVE_HONDA = iniReader.ReadInteger("Unfinished Business Items","TEX_MOVIE_HAVE_HONDA", 1358);
LAPTOP_TRANSMITTER = iniReader.ReadInteger("Unfinished Business Items","LAPTOP_TRANSMITTER", 1355);
CHE_GUEVARA_CANTEEN = iniReader.ReadInteger("Unfinished Business Items","CHE_GUEVARA_CANTEEN", 1359);
MERC_WRISTWATCH = iniReader.ReadInteger("Unfinished Business Items","MERC_WRISTWATCH", 1360);
SAM_GARVER_COMBAT_KNIFE = iniReader.ReadInteger("Unfinished Business Items","SAM_GARVER_COMBAT_KNIFE", 1353);
MERC_UMBRELLA_OLD = iniReader.ReadInteger("Unfinished Business Items","MERC_UMBRELLA_OLD", 1361);
MORRIS_INSTRUCTION_NOTE = iniReader.ReadInteger("Unfinished Business Items","MORRIS_INSTRUCTION_NOTE", 1362);
HAND_CANNON = iniReader.ReadInteger("Unfinished Business Items","HAND_CANNON", 1352);
HARTFORD_6_SHOOTER = iniReader.ReadInteger("Unfinished Business Items","HARTFORD_6_SHOOTER", 66);
MERC_UMBRELLA = iniReader.ReadInteger("Unfinished Business Items","MERC_UMBRELLA", 1361);
CLIP_CANNON_BALL = iniReader.ReadInteger("Unfinished Business Items","CLIP_CANNON_BALL", 1354);
BARRETT_UB = iniReader.ReadInteger("Unfinished Business Items","BARRETT_UB", 335);
CALICO_960_UB = iniReader.ReadInteger("Unfinished Business Items","CALICO_960_UB", 69);
PSG1_UB = iniReader.ReadInteger("Unfinished Business Items","PSG1_UB", 334);
L85_UB = iniReader.ReadInteger("Unfinished Business Items","L85_UB", 331);
TAR21_UB = iniReader.ReadInteger("Unfinished Business Items","TAR21_UB", 332);
VAL_SILENT_UB = iniReader.ReadInteger("Unfinished Business Items","VAL_SILENT_UB", 333);
MICRO_UZI_UB = iniReader.ReadInteger("Unfinished Business Items","MICRO_UZI_UB", 330);
CALICO_950_UB = iniReader.ReadInteger("Unfinished Business Items","CALICO_950_UB", 67);
CALICO_900_UB = iniReader.ReadInteger("Unfinished Business Items","CALICO_900_UB", 68);
// -----------------------
// Profiles
// -----------------------
MANUEL_UB = iniReader.ReadInteger("Unfinished Business Profiles","MANUEL", 60);
BIGGENS_UB = iniReader.ReadInteger("Unfinished Business Profiles","BIGENS", 61);
JOHN_K_UB = iniReader.ReadInteger("Unfinished Business Profiles","JOHN_K", 62);
TEX_UB = iniReader.ReadInteger("Unfinished Business Profiles","TEX", 64);
GASTON_UB = iniReader.ReadInteger("Unfinished Business Profiles","GASTON", 58);
STOGIE_UB = iniReader.ReadInteger("Unfinished Business Profiles","STOGIE", 59);
JERRY_MILO_UB = iniReader.ReadInteger("Unfinished Business Profiles","JERRY", 76);
PGMALE4_UB = iniReader.ReadInteger("Unfinished Business Profiles","PGMALE4", 57);
BETTY_UB = iniReader.ReadInteger("Unfinished Business Profiles","BETTY", 73);
RAUL_UB = iniReader.ReadInteger("Unfinished Business Profiles","RAUL", 74);
MORRIS_UB = iniReader.ReadInteger("Unfinished Business Profiles","MORRIS", 75);
RUDY_UB = iniReader.ReadInteger("Unfinished Business Profiles","RUDY", 77);
#endif
}