diff options
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | src/base/index.c | 2 | ||||
| -rw-r--r-- | src/base/item.c | 4 | ||||
| -rwxr-xr-x | src/modules/modMove.c | 22 | ||||
| -rw-r--r-- | src/screen/screen_settingKeys.c | 1 |
5 files changed, 8 insertions, 23 deletions
@@ -1 +1 @@ -#define TUXANCI_NG_VERSION "svn180" +#define TUXANCI_NG_VERSION "svn181" diff --git a/src/base/index.c b/src/base/index.c index 52d3f08..b7ee929 100644 --- a/src/base/index.c +++ b/src/base/index.c @@ -16,6 +16,7 @@ static int* index_newInt(int x) return new; } +#ifdef CHECK_INDEX static void printIndex(list_t *list) { int i; @@ -30,6 +31,7 @@ static void printIndex(list_t *list) printf("%d\n", thisIndex); } } +#endif #ifdef CHECK_INDEX static void checkIndex(list_t *list) diff --git a/src/base/item.c b/src/base/item.c index 2cbae3f..141240b 100644 --- a/src/base/item.c +++ b/src/base/item.c @@ -486,7 +486,9 @@ static void action_giveitem(space_t *space, item_t *item, tux_t *tux) delObjectFromSpaceWithObject(space, item, destroyItem); +#ifdef PUBLIC_SERVER addNewItem(space, ID_UNKNOWN); +#endif break; case ITEM_MINE : @@ -519,7 +521,9 @@ static void action_giveitem(space_t *space, item_t *item, tux_t *tux) delObjectFromSpaceWithObject(space, item, destroyItem); +#ifdef PUBLIC_SERVER addNewItem(space, ID_UNKNOWN); +#endif break; } } diff --git a/src/modules/modMove.c b/src/modules/modMove.c index f4ac84e..dc51685 100755 --- a/src/modules/modMove.c +++ b/src/modules/modMove.c @@ -24,28 +24,6 @@ static export_fce_t *export_fce; -static int getRandomPosition() -{ - switch( random() % 4 ) - { - case 0 : - return TUX_UP; - - case 1 : - return TUX_LEFT; - - case 2 : - return TUX_RIGHT; - - case 3 : - return TUX_DOWN; - } - - assert( ! "Stupid error ! " ); - - return -1; // no warnning -} - static void move_tux(tux_t *tux, int x, int y, int w, int h) { int dist_x = 0, dist_y = 0; // no warnning diff --git a/src/screen/screen_settingKeys.c b/src/screen/screen_settingKeys.c index b4ec19f..70c59db 100644 --- a/src/screen/screen_settingKeys.c +++ b/src/screen/screen_settingKeys.c @@ -76,6 +76,7 @@ void startScreenSettingKeys() static void setKeytableFromConfigFile(textFile_t *configFile)
{
char val[STR_SIZE];
+ loadValueFromConfigFile(configFile, "TUX_RIGHT_MOVE_UP", val, STR_SIZE, "273");
keytable[ KEY_TUX_RIGHT_MOVE_UP ] = atoi(val);
loadValueFromConfigFile(configFile, "TUX_RIGHT_MOVE_RIGHT", val, STR_SIZE, "275");
keytable[ KEY_TUX_RIGHT_MOVE_RIGHT ] = atoi(val);
|