|
337
|
1 |
diff -ur freedroidrpg-0.10.2-orig/src/proto.h freedroidrpg-0.10.2/src/proto.h
|
|
|
2 |
--- freedroidrpg-0.10.2-orig/src/proto.h 2007-06-23 04:08:21.000000000 +0700
|
|
|
3 |
+++ freedroidrpg-0.10.2/src/proto.h 2007-07-10 16:28:07.152417803 +0700
|
|
|
4 |
@@ -106,7 +106,7 @@
|
|
|
5 |
EXTERN void translate_map_point_to_screen_pixel_func( float x_map_pos, float y_map_pos, int * x_res, int * y_res, float zoom_factor);
|
|
270
|
6 |
EXTERN int translate_map_point_to_screen_pixel_deviation_tracking ( float x_map_pos , float y_map_pos , int give_x );
|
|
337
|
7 |
//EXTERN void translate_map_point_to_zoomed_screen_pixel ( float x_map_pos , float y_map_pos , int* x_res, int* y_res);
|
|
270
|
8 |
-EXTERN inline float translate_pixel_to_map_location ( int player_num , float axis_x , float axis_y , int give_x ) ;
|
|
|
9 |
+EXTERN float translate_pixel_to_map_location ( int player_num , float axis_x , float axis_y , int give_x ) ;
|
|
337
|
10 |
EXTERN void skew_and_blit_rect( float x1, float y1, float x2, float y2, Uint32 color);
|
|
270
|
11 |
EXTERN float translate_pixel_to_zoomed_map_location ( int player_num , float axis_x , float axis_y , int give_x );
|
|
|
12 |
EXTERN void blit_zoomed_iso_image_to_map_position ( iso_image* our_iso_image , float pos_x , float pos_y );
|
|
337
|
13 |
@@ -911,14 +911,14 @@
|
|
270
|
14 |
#else
|
|
|
15 |
#define EXTERN extern
|
|
|
16 |
#endif
|
|
|
17 |
-EXTERN inline Uint32 FdGetPixel32 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
18 |
-EXTERN inline Uint32 FdGetPixel24 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
19 |
-EXTERN inline Uint16 FdGetPixel16 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
20 |
-EXTERN inline Uint8 FdGetPixel8 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
21 |
-EXTERN inline void PutPixel32 (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
22 |
-EXTERN inline void PutPixel24 (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
23 |
-EXTERN inline void PutPixel16 (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
24 |
-EXTERN inline void PutPixel8 (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
25 |
+EXTERN Uint32 FdGetPixel32 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
26 |
+EXTERN Uint32 FdGetPixel24 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
27 |
+EXTERN Uint16 FdGetPixel16 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
28 |
+EXTERN Uint8 FdGetPixel8 (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
29 |
+EXTERN void PutPixel32 (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
30 |
+EXTERN void PutPixel24 (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
31 |
+EXTERN void PutPixel16 (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
32 |
+EXTERN void PutPixel8 (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
33 |
EXTERN Uint32 FdGetPixel (SDL_Surface * Surface, Sint32 X, Sint32 Y);
|
|
|
34 |
EXTERN void PutPixel (SDL_Surface * surface, int x, int y, Uint32 pixel);
|
|
|
35 |
|
|
337
|
36 |
Only in freedroidrpg-0.10.2/src: proto.h.rej
|
|
|
37 |
Only in freedroidrpg-0.10.2/src: proto.h~
|