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

- code cleanup mostly from Brent Johnson (Nonomori), a very few from me

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Lesh
2006-09-06 19:10:08 +00:00
parent f205c1f620
commit 6df124efd7
34 changed files with 174 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+2 -2
View File
@@ -2222,7 +2222,7 @@ UINT8 CalculateObjectWeight( OBJECTTYPE *pObject )
{
//Pulmu:
//Temporary calculation for minWeight
UINT32 uiMinWeight = (Item[ pObject->usGunAmmoItem].ubWeight / 5.0) + 0.5;
UINT32 uiMinWeight = (UINT32)((Item[ pObject->usGunAmmoItem].ubWeight / 5.0) + 0.5);
if( uiMinWeight < 1 || uiMinWeight > Item[ pObject->usGunAmmoItem].ubWeight)
{
uiMinWeight = 1;
@@ -2248,7 +2248,7 @@ UINT8 CalculateObjectWeight( OBJECTTYPE *pObject )
{
usWeight = 0;
//Temporary calculation for minWeight. 0.2*ubWeight rounded correctly
UINT32 uiMinWeight = (Item[pObject->usItem].ubWeight / 5.0) + 0.5;
UINT32 uiMinWeight = (UINT32)((Item[pObject->usItem].ubWeight / 5.0) + 0.5);
if( uiMinWeight < 1 || uiMinWeight > Item[pObject->usItem].ubWeight)
{
uiMinWeight = 1;
Tactical/LOS.cpp
+1 -1
View File
@@ -144,7 +144,7 @@ static UINT8 gubTreeSightReduction[ANIM_STAND + 1] =
#define MAX_CHANCE_OF_HITTING_STRUCTURE 90
static guiStructureHitChance[ MAX_DIST_FOR_LESS_THAN_MAX_CHANCE_TO_HIT_STRUCTURE + 1] =
static UINT32 guiStructureHitChance[ MAX_DIST_FOR_LESS_THAN_MAX_CHANCE_TO_HIT_STRUCTURE + 1] =
{
0, // 0 tiles
0,
Tactical/Map Information.cpp
+2 -3
View File
@@ -25,9 +25,9 @@
//Don't mess with this value, unless you want to force update all maps in the game!
// Lesh: fix the sad situation with the different major map versions
//#ifdef RUSSIAN
#define MAJOR_MAP_VERSION 6.00
//#define MAJOR_MAP_VERSION 6.00
//#else
// #define MAJOR_MAP_VERSION 5.00
#define MAJOR_MAP_VERSION 5.00
//#endif
FLOAT gdMajorMapVersion = MAJOR_MAP_VERSION;
@@ -37,7 +37,6 @@ BOOLEAN gfWorldLoaded;
MAPCREATE_STRUCT gMapInformation;
//Current minor map version updater.
// Lesh: increased. was 25
#define MINOR_MAP_VERSION 25
UINT8 gubMinorMapVersion = MINOR_MAP_VERSION;
Tactical/Soldier Control.cpp
+1 -1
View File
@@ -11443,7 +11443,7 @@ void DebugValidateSoldierData( )
SOLDIERTYPE *pSoldier;
CHAR16 sString[ 1024 ];
BOOLEAN fProblemDetected = FALSE;
static uiFrameCount = 0;
static UINT32 uiFrameCount = 0;
// this function is too slow to run every frame, so do the check only every 50 frames