diff options
author | taw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5> | 2008-08-04 12:36:37 +0000 |
---|---|---|
committer | taw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5> | 2008-08-04 12:36:37 +0000 |
commit | 61e7ac209eef22045823551b423289b4c237d8cd (patch) | |
tree | 6a3c3f682f56c6d1fdedd6058948ba03c882a71e /src/game.c | |
parent | c8d18a9f558a037739e2dd52350d7e6849d3d600 (diff) |
I am a muppet (remove duplicate rooms list shuffle)
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@207 84d2e878-0bd5-11dd-ad15-13eda11d74c5
Diffstat (limited to 'src/game.c')
-rw-r--r-- | src/game.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -162,8 +162,8 @@ static void game_delete_room(Game *game, int idx) { free(room); /* Shift the list up one place */ - for ( i=idx+1; i<game->num_rooms; i++ ) { - game->rooms[i-1] = game->rooms[i]; + for ( i=idx; i<game->num_rooms-1; i++ ) { + game->rooms[i] = game->rooms[i+1]; } game->num_rooms--; @@ -256,14 +256,9 @@ static void game_load_all_relevant(Game *game) { /* Remove any rooms left in the list which are no longer needed */ for ( i=0; i<game->num_rooms; i++ ) { if ( !game->rooms[i]->needed_this_time ) { - int j; if ( game->debug ) printf("GM: %2i %2i %2i is no longer needed\n", game->rooms[i]->rx, game->rooms[i]->ry, game->rooms[i]->rz); game_delete_room(game, i); - for ( j=i; j<game->num_rooms-1; j++ ) { - game->rooms[j] = game->rooms[j+1]; - } - game->num_rooms--; } } |