Overview
Comment: | Implement object examine mode better now. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
a84d299534e05ef2ce8c91a50505e714 |
User & Date: | user on 2020-12-10 22:26:17 |
Other Links: | manifest | tags |
Context
2020-12-11
| ||
03:22 | Implement more instructions, and fix v_send_message so that it doesn't crash if the target is 0 check-in: 5b1c214aab user: user tags: trunk | |
2020-12-10
| ||
22:26 | Implement object examine mode better now. check-in: a84d299534 user: user tags: trunk | |
08:09 | Remove an improper division by zero error check-in: 23b475cc02 user: user tags: trunk | |
Changes
Modified game.c from [d5437772c7] to [0ea21b73a0].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | #include <stdlib.h> #include <string.h> #include "sqlite3.h" #include "smallxrm.h" #include "heromesh.h" #include "quarks.h" #include "cursorshapes.h" static volatile Uint8 timerflag; static void redraw_game(void) { char buf[32]; SDL_Rect r; int x,y; r.x=r.y=0; r.h=screen->h; | > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #include <stdlib.h> #include <string.h> #include "sqlite3.h" #include "smallxrm.h" #include "heromesh.h" #include "quarks.h" #include "cursorshapes.h" #include "names.h" static volatile Uint8 timerflag; static int exam_scroll; static void redraw_game(void) { char buf[32]; SDL_Rect r; int x,y; r.x=r.y=0; r.h=screen->h; |
︙ | ︙ | |||
95 96 97 98 99 100 101 102 103 104 105 106 107 108 | if(t) { gameover=-1; screen_message(t); } else { gameover=0; } } static void list_objects_at(int xy) { static const char*const dirs[8]={"E ","NE","N ","NW","W ","SW","S ","SE"}; SDL_Event ev; SDL_Rect r; char buf[256]; int scroll=0; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | if(t) { gameover=-1; screen_message(t); } else { gameover=0; } } static inline void exam_value(const char*t,int y,Value v) { char buf[256]; int i; y=(y-exam_scroll)*8; if(y<0 || y>screen->h-8) return; draw_text(0,y,t,0xF0,0xF7); switch(v.t) { case TY_NUMBER: snprintf(buf,255,"%12lu 0x%08lX %ld",(long)v.u,(long)v.u,(long)v.s); draw_text(200,y,buf,0xF0,0xFE); break; case TY_CLASS: draw_text(200,y,"$",0xF0,0xFB); draw_text(208,y,classes[v.u]->name,0xF0,0xFB); break; case TY_MESSAGE: snprintf(buf,255,"%s%s",v.u<256?"":"#",v.u<256?standard_message_names[v.u]:messages[v.u-256]); draw_text(200,y,buf,0xF0,0xFD); break; case TY_LEVELSTRING: break; case TY_STRING: break; case TY_SOUND: case TY_USOUND: draw_text(200,y,"<Sound>",0xF0,0xF6); break; default: snprintf(buf,80,"<%lu:%lu>",(long)v.u,(long)v.t); draw_text(200,y,buf,0xF0,0xFA); i=strlen(buf)*8+208; if(v.u<nobjects && objects[v.u]) { snprintf(buf,80,"@ (%d,%d)",objects[v.u]->x,objects[v.u]->y); draw_text(i,y,buf,0xF0,0xF2); } else { draw_text(i,y,"(dead)",0xF0,0xF4); } break; } } static inline void exam_flags(int y,Uint16 v) { y=(y-exam_scroll)*8; if(y<0 || y>screen->h-8) return; draw_text(0,y,"Flags:",0xF0,0xF7); draw_text(200,y,"--- --- --- --- --- --- --- --- --- --- ---",0xF0,0xF8); if(v&OF_INVISIBLE) draw_text(200,y,"Inv",0xF0,0xFF); if(v&OF_VISUALONLY) draw_text(232,y,"Vis",0xF0,0xFF); if(v&OF_STEALTHY) draw_text(264,y,"Stl",0xF0,0xFF); if(v&OF_BUSY) draw_text(296,y,"Bus",0xF0,0xFF); if(v&OF_USERSTATE) draw_text(328,y,"Ust",0xF0,0xFF); if(v&OF_USERSIGNAL) draw_text(360,y,"Usg",0xF0,0xFF); if(v&OF_MOVED) draw_text(392,y,"Mov",0xF0,0xFF); if(v&OF_DONE) draw_text(424,y,"Don",0xF0,0xFF); if(v&OF_KEYCLEARED) draw_text(456,y,"Key",0xF0,0xFF); if(v&OF_DESTROYED) draw_text(488,y,"Des",0xF0,0xFF); if(v&OF_BIZARRO) draw_text(520,y,"Biz",0xF0,0xFF); } static inline void exam_hardsharp(const char*t,int y,Uint16*v) { int i; char buf[16]; y=(y-exam_scroll)*8; if(y<0 || y>screen->h-8) return; draw_text(0,y,t,0xF0,0xF7); for(i=0;i<4;i++) { snprintf(buf,8,"%5u",v[i]); draw_text(200+i*56,y,buf,0xF0,v[i]?0xFF:0xF8); } } static void draw_back_line(int y,int c) { unsigned char*p=screen->pixels; int i; p+=screen->pitch*y; for(i=0;i<screen->w;i++) if(p[i]==0xF0 || p[i]==0xF1) p[i]=i&1?c:0xF0; } static void examine(Uint32 n) { sqlite3_stmt*st; SDL_Event ev; SDL_Rect r; Object*o; int i,y; y=0; i=sqlite3_prepare_v2(userdb,"SELECT '%'||`NAME`,`ID`&0xFFFF FROM `VARIABLES` WHERE `ID` BETWEEN ?1 AND (?1|0xFFFF) ORDER BY `ID`",-1,&st,0); if(i) fatal("SQL error (%d): %s",i,sqlite3_errmsg(userdb)); object: if(n==VOIDLINK) return; o=objects[n]; if(!o) return; sqlite3_bind_int(st,1,o->class<<16); exam_scroll=0; redraw: set_cursor(XC_arrow); r.x=r.y=0; r.w=screen->w; r.h=screen->h; SDL_FillRect(screen,&r,0xF0); SDL_LockSurface(screen); exam_value("Self:",0,OVALUE(n)); exam_value("Class:",1,CVALUE(o->class)); exam_value("Image:",2,NVALUE(o->image)); exam_value("Dir:",3,NVALUE(o->dir)); exam_value("Misc1:",4,o->misc1); exam_value("Misc2:",5,o->misc2); exam_value("Misc3:",6,o->misc3); exam_value("Misc4:",7,o->misc4); exam_value("Misc5:",8,o->misc5); exam_value("Misc6:",9,o->misc6); exam_value("Misc7:",10,o->misc7); exam_value("Temperature:",11,NVALUE(o->temperature)); exam_flags(12,o->oflags); exam_value("Density:",13,NVALUE(o->density)); exam_value("Volume:",14,NVALUE(o->volume)); exam_value("Strength:",15,NVALUE(o->strength)); exam_value("Weight:",16,NVALUE(o->weight)); exam_value("Climb:",17,NVALUE(o->climb)); exam_value("Height:",18,NVALUE(o->height)); exam_value("Arrivals:",19,NVALUE(o->arrivals)); exam_value("Departures:",20,NVALUE(o->departures)); exam_value("Shape:",21,NVALUE(o->shape)); exam_value("Shovable:",22,NVALUE(o->shovable)); exam_value("Distance:",23,NVALUE(o->distance)); exam_value("Inertia:",24,NVALUE(o->inertia)); exam_hardsharp("Hardness:",25,o->hard); exam_hardsharp("Sharpness:",26,o->sharp); while(sqlite3_step(st)==SQLITE_ROW) { i=sqlite3_column_int(st,1); exam_value(sqlite3_column_text(st,0),i+28,o->uservars[i]); } sqlite3_reset(st); SDL_UnlockSurface(screen); SDL_Flip(screen); while(SDL_WaitEvent(&ev)) switch(ev.type) { case SDL_KEYDOWN: switch(ev.key.keysym.sym) { case SDLK_ESCAPE: case SDLK_RETURN: case SDLK_KP_ENTER: sqlite3_finalize(st); return; case SDLK_UP: if(exam_scroll) exam_scroll--; break; case SDLK_DOWN: exam_scroll++; break; case SDLK_HOME: exam_scroll=0; break; case SDLK_PAGEUP: exam_scroll-=screen->h/8; if(exam_scroll<0) exam_scroll=0; break; case SDLK_PAGEDOWN: exam_scroll+=screen->h/8; break; } goto redraw; case SDL_MOUSEMOTION: if(ev.motion.y!=y && ev.motion.y<screen->h) { SDL_LockSurface(screen); draw_back_line(y,0xF0); draw_back_line(y=ev.motion.y,0xF1); SDL_UnlockSurface(screen); SDL_Flip(screen); } break; case SDL_VIDEOEXPOSE: goto redraw; case SDL_QUIT: exit(0); break; } } static void list_objects_at(int xy) { static const char*const dirs[8]={"E ","NE","N ","NW","W ","SW","S ","SE"}; SDL_Event ev; SDL_Rect r; char buf[256]; int scroll=0; |
︙ | ︙ | |||
133 134 135 136 137 138 139 140 141 142 143 144 145 | draw_text(24,r.y,buf,0xF1,o->generation?0xFF:0xF8); n=o->down; r.y+=8; } SDL_UnlockSurface(screen); SDL_Flip(screen); while(SDL_WaitEvent(&ev)) { switch(ev.type) { case SDL_MOUSEMOTION: set_cursor(XC_draft_small); break; case SDL_KEYDOWN: switch(ev.key.keysym.sym) { | > > > > > > > > > > > > > > > | | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 | draw_text(24,r.y,buf,0xF1,o->generation?0xFF:0xF8); n=o->down; r.y+=8; } SDL_UnlockSurface(screen); SDL_Flip(screen); while(SDL_WaitEvent(&ev)) { if(ev.type!=SDL_VIDEOEXPOSE) { r.h=screen->h-8; r.x=0; r.y=8; if(scrollbar(&scroll,r.h/8,count,&ev,&r)) goto redraw; } switch(ev.type) { case SDL_MOUSEBUTTONDOWN: if(ev.button.button!=1 || ev.button.y<8) break; j=ev.button.y/8-scroll-1; if(j>=count) break; n=t; for(i=0;i<j;i++) n=objects[n]->down; examine(n); set_cursor(XC_draft_small); goto redraw; case SDL_MOUSEMOTION: set_cursor(XC_draft_small); break; case SDL_KEYDOWN: switch(ev.key.keysym.sym) { case SDLK_ESCAPE: case SDLK_RETURN: case SDLK_KP_ENTER: return; } goto redraw; case SDL_VIDEOEXPOSE: goto redraw; case SDL_QUIT: exit(0); break; |
︙ | ︙ |
Modified heromesh.h from [431eca0830] to [5f07c527d6].
︙ | ︙ | |||
174 175 176 177 178 179 180 | #define ANI_OSC 0x08 typedef struct { //TODO } Animation; typedef struct { | | | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | #define ANI_OSC 0x08 typedef struct { //TODO } Animation; typedef struct { Sint32 height,weight,climb,density,volume,strength,arrivals,departures,temperature,inertia; Uint32 arrived,departed,arrived2,departed2,generation; Uint32 up,down,prev,next; // links to other objects Uint16 class,oflags,distance; Uint16 sharp[4]; Uint16 hard[4]; Uint8 x,y,shape,shovable,image,dir; Animation*anim; |
︙ | ︙ |