762b095462
Step 1+2 of the SDL 3 migration. The 2300-line graphics/glSDL.{c,h}
OpenGL-on-top-of-SDL-1.2 shim is obsolete under SDL 3 (SDL_Renderer
does what glSDL did natively), and its #define overrides of SDL
surface APIs collided directly with SDL 3's SDL_oldnames.h.
- Add graphics/sdl_compat.h: a one-line umbrella that just pulls in
<SDL3/SDL.h>.
- Replace every #include "glSDL.h" with #include "sdl_compat.h" (15
files across the tree).
- Delete graphics/glSDL.c, graphics/glSDL.h.
- Drop glSDL.c from graphics/CMakeLists.txt.
- Remove GFX_DRIVER_GLSDL from the gfx_drivers_t enum and from all
switches/conditions in gfxengine.cpp.
- Drop the glSDL_VSync() call site (will be re-introduced as
SDL_SetRenderVSync once gfxengine is ported to SDL_Renderer).
- Drop the two glSDL_Invalidate() calls in window.cpp (texture
re-upload hints with no equivalent in a pure-surface compositor).
- options.cpp: remove the now-empty "OpenGL/glSDL" menu item; force
videodriver to GFX_DRIVER_SDL2D.
- prefs.cpp: collapse legacy GLSDL setting onto SDL2D on load.
After this commit the macro-collision wall is gone (renamed_-token
errors drop from many to zero). The build still fails on the next
layer of work: SDL 1.2 surface APIs that no longer exist
(SDL_FreeSurface, SDL_SetAlpha, SDL_CreateRGBSurface, SDL_DisplayFormat,
SDL_PixelFormat struct member access, SDL audio callback API, etc.).
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
111 lines
3.2 KiB
C++
111 lines
3.2 KiB
C++
/*(GPL)
|
|
------------------------------------------------------------
|
|
Kobo Deluxe - An enhanced SDL port of XKobo
|
|
------------------------------------------------------------
|
|
* Copyright (C) 1995, 1996 Akira Higuchi
|
|
* Copyright (C) 2002 Jeremy Sheeley
|
|
* Copyright (C) 2001-2003, 2007 David Olofson
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#ifndef _KOBO_MANAGE_H_
|
|
#define _KOBO_MANAGE_H_
|
|
|
|
#include "sdl_compat.h"
|
|
#include "score.h"
|
|
|
|
class _manage
|
|
{
|
|
static int blank;
|
|
static int next_state_out;
|
|
static int next_state_next;
|
|
static int game_seed;
|
|
static int bonus_next;
|
|
static int scroll_jump;
|
|
static int delay_count;
|
|
static int introtime;
|
|
static int rest_cores;
|
|
static int exit_manage;
|
|
static int playing;
|
|
static int _get_ready;
|
|
static int _game_over;
|
|
static s_hiscore_t hi;
|
|
static int noise_flash;
|
|
static int noise_duration;
|
|
static int noise_timer;
|
|
static float noise_level;
|
|
static int intro_x;
|
|
static int intro_y;
|
|
static int show_bars;
|
|
|
|
static void next_scene();
|
|
static void retry();
|
|
|
|
static int scene_num;
|
|
static int score;
|
|
static float disp_health;
|
|
static float disp_temp;
|
|
static int flush_score_count;
|
|
static int flush_ships_count;
|
|
static int score_changed;
|
|
static int ships_changed;
|
|
static void put_health(int force = 0);
|
|
static void put_temp(int force = 0);
|
|
static void put_info();
|
|
static void put_score();
|
|
static void put_ships();
|
|
static void flush_score();
|
|
static void flush_ships();
|
|
static void game_stop();
|
|
static void run_noise();
|
|
public:
|
|
static int ships;
|
|
static void init();
|
|
static void set_bars();
|
|
static void init_resources_title();
|
|
static void init_resources_to_play(int newship);
|
|
static void noise(int duration, int flash);
|
|
static void noise_out(int duration);
|
|
static void noise_damage(float amt);
|
|
static void update();
|
|
static void run_intro();
|
|
static void run_pause();
|
|
static void run_game();
|
|
static void lost_myship();
|
|
static void destroyed_a_core();
|
|
static void add_score(int sc);
|
|
static void key_down(SDLKey sym);
|
|
static void key_up(SDLKey sym);
|
|
static int title_blank() { return blank; }
|
|
static void select_next(int redraw_map = 1);
|
|
static void select_prev(int redraw_map = 1);
|
|
static void regenerate();
|
|
static void select_scene(int scene, int redraw_map = 1);
|
|
static int scene() { return scene_num; }
|
|
static void abort();
|
|
static void freeze_abort();
|
|
static int aborted() { return exit_manage; }
|
|
static void reenter();
|
|
static int game_stopped() { return !playing; }
|
|
static int get_ready();
|
|
static void game_start();
|
|
static int game_over();
|
|
};
|
|
|
|
extern _manage manage;
|
|
|
|
#endif //_KOBO_MANAGE_H_
|