diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-10-16 14:22:16 -0700 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-10-16 22:32:55 -0700 |
| commit | 0445f1ad3e145c04fa9407a699c138fb2be364c0 (patch) | |
| tree | bd768a3e99446f408a30d24498d43e8c56a4d829 | |
| parent | be25be22d818c1f94dbe844cb9ea27132c130450 (diff) | |
game: Rename game_game_load_resource()
... to game_game_load_old_resource(). I want the name for something
else.
| -rw-r--r-- | games/pacman/pacman-grid.c | 4 | ||||
| -rw-r--r-- | libgame/game-game.c | 4 | ||||
| -rw-r--r-- | libgame/game-game.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/games/pacman/pacman-grid.c b/games/pacman/pacman-grid.c index c370524..b121493 100644 --- a/games/pacman/pacman-grid.c +++ b/games/pacman/pacman-grid.c @@ -425,7 +425,7 @@ pacman_grid_next_level (PacmanGrid *pacman) mapname = g_strdup_printf ("map%u", ((pacman->level - 1) % pacman->maxlevel) + 1); else mapname = g_strdup_printf ("map%u", pacman->level); - leveldata = game_game_load_resource (GAME_OBJECT (pacman)->game, mapname, + leveldata = game_game_load_old_resource (GAME_OBJECT (pacman)->game, mapname, &i, NULL); if (leveldata) parsed_leveldata = game_grid_prepare_ascii_map (leveldata, i, @@ -435,7 +435,7 @@ pacman_grid_next_level (PacmanGrid *pacman) if (!parsed_leveldata) { pacman->maxlevel = pacman->level - 1; if (pacman->maxlevel > 0) { - leveldata = game_game_load_resource (GAME_OBJECT (pacman)->game, "map1", + leveldata = game_game_load_old_resource (GAME_OBJECT (pacman)->game, "map1", &i, NULL); parsed_leveldata = game_grid_prepare_ascii_map (leveldata, i, grid->width * grid->height); diff --git a/libgame/game-game.c b/libgame/game-game.c index 67decd7..3afe905 100644 --- a/libgame/game-game.c +++ b/libgame/game-game.c @@ -993,7 +993,7 @@ game_game_print (GameGame *game) } /** - * game_game_load_resource: + * game_game_load_old_resource: * @game: a #GameGame * @resource_name: identifying name of the resource * @length: an optional pointer to take the length of the returned data @@ -1013,7 +1013,7 @@ game_game_print (GameGame *game) * until the game ends, after that it will be freed automatically. **/ const guchar * -game_game_load_resource (GameGame *game, const char *resource_name, gsize *length, +game_game_load_old_resource (GameGame *game, const char *resource_name, gsize *length, GError **error) { guchar *ret = NULL; diff --git a/libgame/game-game.h b/libgame/game-game.h index ff9d93d..634b923 100644 --- a/libgame/game-game.h +++ b/libgame/game-game.h @@ -166,7 +166,7 @@ void game_game_flush (GameGame * game); gboolean game_game_save (GameGame * game, const char * filename); -const guchar * game_game_load_resource (GameGame * game, +const guchar * game_game_load_old_resource (GameGame * game, const char * resource_name, gsize * length, GError ** error); |