patches/freedroidrpg-02-inline.diff
author drdoug007
Sun, 06 May 2007 11:24:58 +0000
changeset 270 44ec059f7c31
child 337 78c3a91d1c0a
permissions -rw-r--r--
2007-05-01 Doug Scott <[email protected]> * SFEfreedroidrpg.spec: added FreeroidRPG Game * patches/freedroidrpg-01-wall.diff: added remove -Wall * patches/freedroidrpg-02-inline.diff: remove inlines on externs * SFEsupertux.spec: added supertux game - Needs joystick driver * SFEggi.spec: Added General Graphics Interface library * base-specs/libggigcp.spec: added ggi library * base-specs/libggi.spec: added ggi library * base-specs/libgii.spec: added ggi library * base-specs/libggimisc.spec: added ggi library * base-specs/libggiwmh.spec: added ggi library * base-specs/libgiigic.spec: added ggi library * patches/libgii-01-gcc-options.diff: patch to remove gcc options * SFEdillo.spec: Added dillo lightweight browser * SFEheroes.spec: Added Heroes game * SFEphysfs.spec: Added physfs library * patches/physfs-01-alloca.diff: added. Solaris needs alloca.h * SFEportaudio.spec: Added portaudio library * patches/portaudio-01-oss.diff: added patch for oss * patches/portaudio-02-pthread.diff: remove -pthread from compile * SFEjam.spec: Added jam (a make lookalike)

diff -ur freedroidrpg-0.10.1-orig/src/proto.h freedroidrpg-0.10.1/src/proto.h
--- freedroidrpg-0.10.1-orig/src/proto.h	2007-02-24 00:42:24.000000000 +0700
+++ freedroidrpg-0.10.1/src/proto.h	2007-05-06 17:33:41.723710882 +0700
@@ -98,7 +98,7 @@
 #define translate_map_point_to_screen_pixel_y(X,Y)  ( UserCenter_y + rintf(( X + Y - Me [ 0 ] . pos . x - Me [ 0 ] . pos . y ) * (iso_floor_tile_height_over_two))) 
 EXTERN int translate_map_point_to_screen_pixel_deviation_tracking ( float x_map_pos , float y_map_pos , int give_x );
 EXTERN int translate_map_point_to_zoomed_screen_pixel ( float x_map_pos , float y_map_pos , int give_x );
-EXTERN inline float translate_pixel_to_map_location ( int player_num , float axis_x , float axis_y , int give_x ) ;
+EXTERN float translate_pixel_to_map_location ( int player_num , float axis_x , float axis_y , int give_x ) ;
 EXTERN float translate_pixel_to_zoomed_map_location ( int player_num , float axis_x , float axis_y , int give_x );
 EXTERN void blit_zoomed_iso_image_to_map_position ( iso_image* our_iso_image , float pos_x , float pos_y );
 EXTERN int tux_can_walk_this_line ( int player_num , float x1, float y1 , float x2 , float y2 );
@@ -839,14 +839,14 @@
 #else
 #define EXTERN extern
 #endif
-EXTERN inline Uint32 FdGetPixel32 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
-EXTERN inline Uint32 FdGetPixel24 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
-EXTERN inline Uint16 FdGetPixel16 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
-EXTERN inline Uint8 FdGetPixel8 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
-EXTERN inline void PutPixel32 (SDL_Surface * surface, int x, int y, Uint32 pixel);
-EXTERN inline void PutPixel24 (SDL_Surface * surface, int x, int y, Uint32 pixel);
-EXTERN inline void PutPixel16 (SDL_Surface * surface, int x, int y, Uint32 pixel);
-EXTERN inline void PutPixel8 (SDL_Surface * surface, int x, int y, Uint32 pixel);
+EXTERN Uint32 FdGetPixel32 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
+EXTERN Uint32 FdGetPixel24 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
+EXTERN Uint16 FdGetPixel16 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
+EXTERN Uint8 FdGetPixel8 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
+EXTERN void PutPixel32 (SDL_Surface * surface, int x, int y, Uint32 pixel);
+EXTERN void PutPixel24 (SDL_Surface * surface, int x, int y, Uint32 pixel);
+EXTERN void PutPixel16 (SDL_Surface * surface, int x, int y, Uint32 pixel);
+EXTERN void PutPixel8 (SDL_Surface * surface, int x, int y, Uint32 pixel);
 EXTERN Uint32 FdGetPixel (SDL_Surface * Surface, Sint32 X, Sint32 Y);
 EXTERN void PutPixel (SDL_Surface * surface, int x, int y, Uint32 pixel);