adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reducing dependencies, one step at a time.

Browse Source 
Also some added comments which I didn't commit yet.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1456 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-01-18 10:47:59 +00:00
parent 1f34d4e5cf
commit 5e8b839aec
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/demo.c
+1 -1
View File
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "starcon.h" #include "demo.h"
#include "declib.h" #include "declib.h"
#if DEMO_MODE || CREATE_JOURNAL #if DEMO_MODE || CREATE_JOURNAL
sc2/src/sc2code/libs/declib.h
+1
View File
@@ -19,6 +19,7 @@
#ifndef _DECLIB_H #ifndef _DECLIB_H
#define _DECLIB_H #define _DECLIB_H
#include "libs/compiler.h"
#define DECODE_REF PVOID #define DECODE_REF PVOID
enum enum
sc2/src/sc2code/starcon.c
+3
View File
@@ -17,6 +17,7 @@
*/ */
#include "starcon.h" #include "starcon.h"
#include "demo.h"
#include "credits.h" #include "credits.h"
//Added by Chris //Added by Chris
@@ -256,6 +257,7 @@ black_urquan_genocide (void)
if (best_dist < 0 && best_dx == 0 && best_dy == 0) if (best_dist < 0 && best_dx == 0 && best_dy == 0)
{ {
// All spheres of influence are gone - game over.
GLOBAL (CurrentActivity) &= ~IN_BATTLE; GLOBAL (CurrentActivity) &= ~IN_BATTLE;
GLOBAL_SIS (CrewEnlisted) = (COUNT)~0; GLOBAL_SIS (CrewEnlisted) = (COUNT)~0;
@@ -263,6 +265,7 @@ black_urquan_genocide (void)
} }
else else
{ {
// Moving towards new race to cleanse.
COUNT speed; COUNT speed;
if (best_dist < 0) if (best_dist < 0)
sc2/src/sc2code/starcon.h
+6 -1
View File
@@ -35,11 +35,17 @@ extern int ScreenHeight;
#define SIS_ORG_X (7 + SAFE_X) #define SIS_ORG_X (7 + SAFE_X)
#define SIS_ORG_Y (10 + SAFE_Y) #define SIS_ORG_Y (10 + SAFE_Y)
#define STATUS_WIDTH 64 #define STATUS_WIDTH 64
/* Width of the status "window" (the right part of the screen) */
#define STATUS_HEIGHT (SCREEN_HEIGHT - (SAFE_Y * 2)) #define STATUS_HEIGHT (SCREEN_HEIGHT - (SAFE_Y * 2))
/* Height of the status "window" (the right part of the screen) */
#define SPACE_WIDTH (SCREEN_WIDTH - STATUS_WIDTH - (SAFE_X * 2)) #define SPACE_WIDTH (SCREEN_WIDTH - STATUS_WIDTH - (SAFE_X * 2))
/* Width of the space "window" (the left part of the screen) */
#define SPACE_HEIGHT (SCREEN_HEIGHT - (SAFE_Y * 2)) #define SPACE_HEIGHT (SCREEN_HEIGHT - (SAFE_Y * 2))
/* Height of the space "window" (the left part of the screen) */
#define SIS_SCREEN_WIDTH (SPACE_WIDTH - 14) #define SIS_SCREEN_WIDTH (SPACE_WIDTH - 14)
/* Width of the usable part of the space "window" */
#define SIS_SCREEN_HEIGHT (SPACE_HEIGHT - 13) #define SIS_SCREEN_HEIGHT (SPACE_HEIGHT - 13)
/* Height of the usable part of the space "window" */
#include "config.h" #include "config.h"
#include "../port.h" #include "../port.h"
@@ -66,7 +72,6 @@ extern int ScreenHeight;
#include "build.h" #include "build.h"
#include "intel.h" #include "intel.h"
#include "sounds.h" #include "sounds.h"
#include "demo.h"
#include "starbase.h" #include "starbase.h"
#include "sis.h" #include "sis.h"
#include "state.h" #include "state.h"