Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resource hack now works with no GNU C compiler, but still hack.

Browse source
This commit is contained in:
johns 2001-07-27 20:03:29 +00:00
parent 38c9cdee0b
commit 97dfebbf2b
3 changed files with 68 additions and 3 deletions

65
src/include/upgrade_structs.h
View file

@ -43,15 +43,26 @@
-- Declarations
----------------------------------------------------------------------------*/
#ifdef __GNUC__ // {
/**
** Default resources for a new player.
*/
#define DEFAULT_RESOURCES \
((int[]){ 0, 2000, 1000, 1000, 1000, 1000, 1000 })
/**
** Default resources for a new player with low resources..
*/
#define DEFAULT_RESOURCES_LOW \
((int[]){ 0, 2000, 1000, 1000, 1000, 1000, 1000 })
/**
** Default resources for a new player with mid resources.
*/
#define DEFAULT_RESOURCES_MEDIUM \
((int[]){ 0, 5000, 2000, 2000, 2000, 2000, 2000 })
/**
** Default resources for a new player with high resources.
*/
#define DEFAULT_RESOURCES_HIGH \
((int[]){ 0, 10000, 5000, 5000, 5000, 5000, 5000 })
@ -73,6 +84,60 @@
#define DEFAULT_NAMES \
((char*[]){"time","gold","wood","oil","ore","stone","coal"})
#else // }{ __GNUC__
/**
** Default resources for a new player.
*/
static const int DEFAULT_RESOURCES[7] = {
0, 2000, 1000, 1000, 1000, 1000, 1000
};
/**
** Default resources for a new player with low resources..
*/
static const int DEFAULT_RESOURCES_LOW[7] = {
0, 2000, 1000, 1000, 1000, 1000, 1000
};
/**
** Default resources for a new player with mid resources.
*/
static const int DEFAULT_RESOURCES_MEDIUM[7] = {
0, 5000, 2000, 2000, 2000, 2000, 2000
};
/**
** Default resources for a new player with high resources.
*/
static const int DEFAULT_RESOURCES_HIGH[7] = {
0, 10000, 5000, 5000, 5000, 5000, 5000
};
/**
** Default incomes for a new player.
*/
static const int DEFAULT_INCOMES[7] = {
0, 100, 100, 100, 100, 100, 100
};
/**
** Default action for the resources.
*/
static const char* DEFAULT_ACTIONS[7] __attribute__((unused)) = {
"stop","mine","chop","drill","mine","mine","mine"
};
/**
** Default names for the resources.
*/
static const char* DEFAULT_NAMES[7] __attribute__((unused)) = {
"time","gold","wood","oil","ore","stone","coal"
};
#endif // } __GNUC__
/**
** Indices into costs/resource/income array. (A litte future here :)
*/

4
src/stratagus/script_player.cpp
View file

@ -171,7 +171,7 @@ local SCM CclPlayer(SCM list)
sublist=gh_cdr(sublist);
for( i=0; i<MaxCosts; ++i ) {
if( gh_eq_p(value,gh_symbol2scm(DEFAULT_NAMES[i])) ) {
if( gh_eq_p(value,gh_symbol2scm((char*)DEFAULT_NAMES[i])) ) {
player->Resources[i]=gh_scm2int(gh_car(sublist));
break;
}
@ -191,7 +191,7 @@ local SCM CclPlayer(SCM list)
sublist=gh_cdr(sublist);
for( i=0; i<MaxCosts; ++i ) {
if( gh_eq_p(value,gh_symbol2scm(DEFAULT_NAMES[i])) ) {
if( gh_eq_p(value,gh_symbol2scm((char*)DEFAULT_NAMES[i])) ) {
player->Incomes[i]=gh_scm2int(gh_car(sublist));
break;
}

2
src/unit/script_unittype.cpp
View file

@ -683,7 +683,7 @@ local SCM CclDefineUnitStats(SCM list)
sublist=gh_cdr(sublist);
for( i=0; i<MaxCosts; ++i ) {
if( gh_eq_p(value,gh_symbol2scm(DEFAULT_NAMES[i])) ) {
if( gh_eq_p(value,gh_symbol2scm((char*)DEFAULT_NAMES[i])) ) {
stats->Costs[i]=gh_scm2int(gh_car(sublist));
break;
}