2000-01-28 00:45:32 +00:00
|
|
|
--- map.h.orig Wed Apr 3 23:58:52 1996
|
|
|
|
|
+++ map.h Tue Jan 18 19:15:44 2000
|
|
|
|
|
@@ -38,14 +38,14 @@
|
|
|
|
|
#define HIT_MASK (CORE | U_MASK | R_MASK | D_MASK | L_MASK)
|
|
|
|
|
|
|
|
|
|
class _map{
|
|
|
|
|
- const int sx_log2 = MAP_SIZEX_LOG2;
|
|
|
|
|
- const int sy_log2 = MAP_SIZEY_LOG2;
|
|
|
|
|
- const int sx = 1 << sx_log2;
|
|
|
|
|
- const int sy = 1 << sy_log2;
|
|
|
|
|
+ int sx_log2;
|
|
|
|
|
+ int sy_log2;
|
|
|
|
|
+ int sx;
|
|
|
|
|
+ int sy;
|
|
|
|
|
int sitex[SITE_MAX];
|
|
|
|
|
int sitey[SITE_MAX];
|
|
|
|
|
int site_max;
|
|
|
|
|
- char data[1 << (sx_log2 + sy_log2)];
|
|
|
|
|
+ char data[1 << (MAP_SIZEX_LOG2 + MAP_SIZEY_LOG2)];
|
|
|
|
|
int maze_pop();
|
|
|
|
|
void maze_push(int x, int y);
|
|
|
|
|
void maze_move_and_push(int x, int y, int d);
|
|
|
|
|
@@ -54,7 +54,7 @@
|
|
|
|
|
void init();
|
|
|
|
|
void make_maze(int x, int y, int difx, int dify);
|
|
|
|
|
void convert(int ratio); /* ratio < 64 */
|
|
|
|
|
- inline char& pos(int x, int y){ return data[(y<<sx_log2) + x];}
|
2000-02-06 21:53:41 +00:00
|
|
|
+ inline char& pos(int x, int y){ return data[(y<<MAP_SIZEX_LOG2) + x];}
|
2000-01-28 00:45:32 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
