From e74bfa203592b2d366b49c71f688904d02dda7df Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 2 Mar 2013 18:11:07 +0000 Subject: Fix inline use. --- games/ltris/distinfo | 6 +- games/ltris/patches/patch-src_sdl.c | 103 ++++++++++++++++++++++++++++++++++ games/ltris/patches/patch-src_sdl.h | 56 ++++++++++++++++++ games/ltris/patches/patch-src_tools.c | 81 ++++++++++++++++++++++++++ games/ltris/patches/patch-src_tools.h | 34 +++++++++++ 5 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 games/ltris/patches/patch-src_sdl.c create mode 100644 games/ltris/patches/patch-src_sdl.h create mode 100644 games/ltris/patches/patch-src_tools.c create mode 100644 games/ltris/patches/patch-src_tools.h (limited to 'games') diff --git a/games/ltris/distinfo b/games/ltris/distinfo index a3c5f88686b..3768bedbff2 100644 --- a/games/ltris/distinfo +++ b/games/ltris/distinfo @@ -1,7 +1,11 @@ -$NetBSD: distinfo,v 1.7 2011/11/16 20:02:30 drochner Exp $ +$NetBSD: distinfo,v 1.8 2013/03/02 18:11:07 joerg Exp $ SHA1 (ltris-1.0.18.tar.gz) = 0197231b2dd5e2adb7aa68cec2ce1edf0867694c RMD160 (ltris-1.0.18.tar.gz) = 4a628146bb0d72eaa9b2f7710aacd2573a1e90af Size (ltris-1.0.18.tar.gz) = 856016 bytes SHA1 (patch-aa) = 951a8dba5a263338be2ff46d7faddc8216aa8345 SHA1 (patch-ab) = 1b06b8a065fa6b4231a3b8d49f6111b37033e5aa +SHA1 (patch-src_sdl.c) = 84f93458bd6998f114688409019ac65466139bed +SHA1 (patch-src_sdl.h) = 4cd62fad8e624bd17c25620682c20ef2839df599 +SHA1 (patch-src_tools.c) = 49d823afae73dcf1f80d17179c0459a60764b4bb +SHA1 (patch-src_tools.h) = 34000dc5c7d6ee60ea462aca0f88e697ca7599ce diff --git a/games/ltris/patches/patch-src_sdl.c b/games/ltris/patches/patch-src_sdl.c new file mode 100644 index 00000000000..114d197c2c2 --- /dev/null +++ b/games/ltris/patches/patch-src_sdl.c @@ -0,0 +1,103 @@ +$NetBSD: patch-src_sdl.c,v 1.1 2013/03/02 18:11:07 joerg Exp $ + +--- src/sdl.c.orig 2013-03-01 22:03:50.000000000 +0000 ++++ src/sdl.c +@@ -244,7 +244,7 @@ done: + #endif + + /* return full path of bitmap */ +-inline void get_full_bmp_path( char *full_path, char *file_name ) ++void get_full_bmp_path( char *full_path, char *file_name ) + { + sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name ); + } +@@ -330,7 +330,7 @@ void free_surf( SDL_Surface **surf ) + /* + lock surface + */ +-inline void lock_surf(SDL_Surface *sur) ++void lock_surf(SDL_Surface *sur) + { + if (SDL_MUSTLOCK(sur)) + SDL_LockSurface(sur); +@@ -339,7 +339,7 @@ inline void lock_surf(SDL_Surface *sur) + /* + unlock surface + */ +-inline void unlock_surf(SDL_Surface *sur) ++void unlock_surf(SDL_Surface *sur) + { + if (SDL_MUSTLOCK(sur)) + SDL_UnlockSurface(sur); +@@ -666,7 +666,7 @@ int write_text(Font *fnt, SDL_Surface *d + /* + lock font surface + */ +-inline void lock_font(Font *fnt) ++void lock_font(Font *fnt) + { + if (SDL_MUSTLOCK(fnt->pic)) + SDL_LockSurface(fnt->pic); +@@ -675,7 +675,7 @@ inline void lock_font(Font *fnt) + /* + unlock font surface + */ +-inline void unlock_font(Font *fnt) ++void unlock_font(Font *fnt) + { + if (SDL_MUSTLOCK(fnt->pic)) + SDL_UnlockSurface(fnt->pic); +@@ -905,7 +905,7 @@ void hardware_cap() + /* + update rectangle (0,0,0,0)->fullscreen + */ +-inline void refresh_screen(int x, int y, int w, int h) ++void refresh_screen(int x, int y, int w, int h) + { + SDL_UpdateRect(sdl.screen, x, y, w, h); + } +@@ -1055,7 +1055,7 @@ void wait_for_click() + /* + lock surface + */ +-inline void lock_screen() ++void lock_screen() + { + if (SDL_MUSTLOCK(sdl.screen)) + SDL_LockSurface(sdl.screen); +@@ -1064,7 +1064,7 @@ inline void lock_screen() + /* + unlock surface + */ +-inline void unlock_screen() ++void unlock_screen() + { + if (SDL_MUSTLOCK(sdl.screen)) + SDL_UnlockSurface(sdl.screen); +@@ -1073,7 +1073,7 @@ inline void unlock_screen() + /* + flip hardware screens (double buffer) + */ +-inline void flip_screen() ++void flip_screen() + { + SDL_Flip(sdl.screen); + } +@@ -1132,7 +1132,7 @@ SDL_Cursor* create_cursor( int width, in + /* + get milliseconds since last call + */ +-inline int get_time() ++int get_time() + { + int ms; + cur_time = SDL_GetTicks(); +@@ -1148,7 +1148,7 @@ inline int get_time() + /* + reset timer + */ +-inline void reset_timer() ++void reset_timer() + { + last_time = SDL_GetTicks(); + } diff --git a/games/ltris/patches/patch-src_sdl.h b/games/ltris/patches/patch-src_sdl.h new file mode 100644 index 00000000000..26fae21fb37 --- /dev/null +++ b/games/ltris/patches/patch-src_sdl.h @@ -0,0 +1,56 @@ +$NetBSD: patch-src_sdl.h,v 1.1 2013/03/02 18:11:07 joerg Exp $ + +--- src/sdl.h.orig 2013-03-01 22:03:43.000000000 +0000 ++++ src/sdl.h +@@ -41,8 +41,8 @@ typedef struct { + SDL_Surface* load_surf(char *fname, int f); + SDL_Surface* create_surf(int w, int h, int f); + void free_surf( SDL_Surface **surf ); +-inline void lock_surf(SDL_Surface *sur); +-inline void unlock_surf(SDL_Surface *sur); ++void lock_surf(SDL_Surface *sur); ++void unlock_surf(SDL_Surface *sur); + void blit_surf(void); + void alpha_blit_surf(int alpha); + void fill_surf(int c); +@@ -86,8 +86,8 @@ Font* load_font(char *fname); + Font* load_fixed_font(char *fname, int off, int len, int w); + void free_font(Font **sfnt); + int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha); +-inline void lock_font(Font *sfnt); +-inline void unlock_font(Font *sfnt); ++void lock_font(Font *sfnt); ++void unlock_font(Font *sfnt); + SDL_Rect last_write_rect(Font *fnt); + int text_width(Font *fnt, char *str); + +@@ -132,14 +132,14 @@ Video_Mode* cur_video_mode(); + char** get_mode_names( int *count ); + int set_video_mode( Video_Mode mode ); + void hardware_cap(); +-inline void refresh_screen( int x, int y, int w, int h ); ++void refresh_screen( int x, int y, int w, int h ); + void refresh_rects(); + void add_refresh_rect(int x, int y, int w, int h); + int wait_for_key(); + void wait_for_click(); +-inline void lock_screen(); +-inline void unlock_screen(); +-inline void flip_screen(); ++void lock_screen(); ++void unlock_screen(); ++void flip_screen(); + void fade_screen( int type, int ms ); + void take_screenshot( int i ); + +@@ -148,8 +148,8 @@ void take_screenshot( int i ); + SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source ); + + /* timer */ +-inline int get_time(); +-inline void reset_timer(); ++int get_time(); ++void reset_timer(); + + #ifdef __cplusplus + }; diff --git a/games/ltris/patches/patch-src_tools.c b/games/ltris/patches/patch-src_tools.c new file mode 100644 index 00000000000..37c55ea4174 --- /dev/null +++ b/games/ltris/patches/patch-src_tools.c @@ -0,0 +1,81 @@ +$NetBSD: patch-src_tools.c,v 1.1 2013/03/02 18:11:07 joerg Exp $ + +--- src/tools.c.orig 2013-03-01 22:02:55.000000000 +0000 ++++ src/tools.c +@@ -23,27 +23,27 @@ + #include "ltris.h" + + /* compares to strings and returns true if their first strlen(str1) chars are equal */ +-inline int strequal( char *str1, char *str2 ) ++int strequal( char *str1, char *str2 ) + { + if ( strlen( str1 ) != strlen( str2 ) ) return 0; + return ( !strncmp( str1, str2, strlen( str1 ) ) ); + } + + /* set delay to ms milliseconds */ +-inline void delay_set( Delay *delay, int ms ) ++void delay_set( Delay *delay, int ms ) + { + delay->limit = ms; + delay->cur = 0; + } + + /* reset delay ( cur = 0 )*/ +-inline void delay_reset( Delay *delay ) ++void delay_reset( Delay *delay ) + { + delay->cur = 0; + } + + /* check if times out and reset */ +-inline int delay_timed_out( Delay *delay, int ms ) ++int delay_timed_out( Delay *delay, int ms ) + { + delay->cur += ms; + if ( delay->cur >= delay->limit ) { +@@ -56,12 +56,12 @@ inline int delay_timed_out( Delay *delay + } + + /* set timer so that we have a time out next call of delay_timed_out() */ +-inline void delay_force_time_out( Delay *delay ) ++void delay_force_time_out( Delay *delay ) + { + delay->cur = delay->limit; + } + +-inline void goto_tile( int *x, int *y, int d ) ++void goto_tile( int *x, int *y, int d ) + { + /* 0 -up, clockwise, 5 - left up */ + switch ( d ) { +@@ -326,24 +326,24 @@ Counter with a current float value and a + the target value until reached when counter_update() is called. + ==================================================================== + */ +-inline void counter_set( Counter *counter, double value ) ++void counter_set( Counter *counter, double value ) + { + counter->value = value; + counter->approach = value; + } +-inline void counter_add( Counter *counter, double add ) ++void counter_add( Counter *counter, double add ) + { + counter->value += add; + } +-inline double counter_get_approach( Counter counter ) ++double counter_get_approach( Counter counter ) + { + return counter.approach; + } +-inline double counter_get( Counter counter ) ++double counter_get( Counter counter ) + { + return counter.value; + } +-inline void counter_update( Counter *counter, int ms ) ++void counter_update( Counter *counter, int ms ) + { + double change; + if ( counter->approach == counter->value ) return; diff --git a/games/ltris/patches/patch-src_tools.h b/games/ltris/patches/patch-src_tools.h new file mode 100644 index 00000000000..f933a0d8e79 --- /dev/null +++ b/games/ltris/patches/patch-src_tools.h @@ -0,0 +1,34 @@ +$NetBSD: patch-src_tools.h,v 1.1 2013/03/02 18:11:07 joerg Exp $ + +--- src/tools.h.orig 2013-03-01 22:02:58.000000000 +0000 ++++ src/tools.h +@@ -33,7 +33,7 @@ + #define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) ) + + /* compares to strings and returns true if their first strlen(str1) chars are equal */ +-inline int strequal( char *str1, char *str2 ); ++int strequal( char *str1, char *str2 ); + + /* delete lines */ + void delete_lines( char **lines, int line_number ); +@@ -45,16 +45,16 @@ typedef struct { + } Delay; + + /* set delay to ms milliseconds */ +-inline void delay_set( Delay *delay, int ms ); ++void delay_set( Delay *delay, int ms ); + + /* reset delay ( cur = 0 )*/ +-inline void delay_reset( Delay *delay ); ++void delay_reset( Delay *delay ); + + /* check if time's out ( add ms milliseconds )and reset */ +-inline int delay_timed_out( Delay *delay, int ms ); ++int delay_timed_out( Delay *delay, int ms ); + + /* set timer so that we have a time out next call of delay_timed_out() */ +-inline void delay_force_time_out( Delay *delay ); ++void delay_force_time_out( Delay *delay ); + + /* return distance betwteen to map positions */ + int get_dist( int x1, int y1, int x2, int y2 ); -- cgit v1.2.3