Changeset 643
- Timestamp:
- May 13, 2011, 9:13:53 AM (11 years ago)
- Location:
- abuse/trunk/src
- Files:
-
- 1 added
- 58 edited
Legend:
- Unmodified
- Added
- Removed
-
abuse/trunk/src/ant.cpp
r577 r643 449 449 fade_out(8); 450 450 wm->set_mouse_position(0,0); 451 screen->clear();451 main_screen->clear(); 452 452 image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1)); 453 im->put_image( screen,0,0);454 455 456 int x1=im->Size().x+1,y1=0,x2=xres,y2= screen->Size().y;453 im->put_image(main_screen,0,0); 454 455 456 int x1=im->Size().x+1,y1=0,x2=xres,y2=main_screen->Size().y; 457 457 fade_in(NULL,16); 458 458 … … 475 475 int w=wm->font()->width()*strlen(msg),h=wm->font()->height(); 476 476 int x=(x1+x2)/2-w/2,y=(y1+y2)/2-h/2; 477 screen->bar(x-10,y-10,x+w+10,y+h+10,wm->bright_color());478 screen->bar(x-9,y-9,x+w+9,y+h+9,wm->medium_color());479 480 wm->font()->put_string( screen,x+1,y+1,msg,wm->dark_color());481 wm->font()->put_string( screen,x,y,msg,wm->bright_color());477 main_screen->bar(x-10,y-10,x+w+10,y+h+10,wm->bright_color()); 478 main_screen->bar(x-9,y-9,x+w+9,y+h+9,wm->medium_color()); 479 480 wm->font()->put_string(main_screen,x+1,y+1,msg,wm->dark_color()); 481 wm->font()->put_string(main_screen,x,y,msg,wm->bright_color()); 482 482 wm->flush_screen(); 483 483 Timer now; now.WaitMs(500); -
abuse/trunk/src/automap.cpp
r555 r643 188 188 } 189 189 190 void automap::handle_event( event &ev)190 void automap::handle_event(Event &ev) 191 191 { 192 192 -
abuse/trunk/src/automap.h
r555 r643 24 24 automap(level *l, int width, int height); 25 25 void toggle_window(); 26 void handle_event( event &ev);26 void handle_event(Event &ev); 27 27 void draw(); 28 28 ~automap() { if (automap_window) toggle_window(); } -
abuse/trunk/src/chars.cpp
r642 r643 170 170 if (t->tiv <= number || !t->vars[number]) 171 171 { 172 lbreak("access : variable does not ex sistfor this class\n");172 lbreak("access : variable does not exists for this class\n"); 173 173 return 0; 174 174 } … … 181 181 if (t->tiv<=number || !t->vars[number]) 182 182 { 183 lbreak("set : variable does not ex sistfor this class\n");183 lbreak("set : variable does not exists for this class\n"); 184 184 return; 185 185 } … … 192 192 if (t->tiv<=number || !t->vars[number]) 193 193 { 194 lbreak("access : variable does not ex sistfor this class\n");194 lbreak("access : variable does not exists for this class\n"); 195 195 return; 196 196 } -
abuse/trunk/src/chat.h
r555 r643 18 18 19 19 public : 20 int chat_event( event &ev) { if (!con_win) return 0; else return con_win==ev.window; }20 int chat_event(Event &ev) { if (!con_win) return 0; else return con_win==ev.window; } 21 21 void draw_user(char *st); 22 22 void put_all(char *st); -
abuse/trunk/src/clisp.cpp
r642 r643 1200 1200 1201 1201 case 50 : dev_cont->add_palette(args); break; 1202 case 51 : write_PCX( screen,pal,lstring_value(CAR(args))); break;1202 case 51 : write_PCX(main_screen,pal,lstring_value(CAR(args))); break; 1203 1203 1204 1204 case 52 : the_game->zoom=lnumber_value(CAR(args)); the_game->draw(); break; … … 1216 1216 case 59 : return menu(args,big_font); break; 1217 1217 case 60 : 1218 { event ev; dev_cont->do_command(lstring_value(CAR(args)),ev); return 1; } break;1218 { Event ev; dev_cont->do_command(lstring_value(CAR(args)),ev); return 1; } break; 1219 1219 case 61 : the_game->set_state(lnumber_value(CAR(args))); break; 1220 1220 … … 1294 1294 the_game->game_to_mouse(x1,y1,current_view,cx1,cy1); 1295 1295 the_game->game_to_mouse(x2,y2,current_view,cx2,cy2); 1296 screen->line(cx1,cy1,cx2,cy2,c);1296 main_screen->line(cx1,cy1,cx2,cy2,c); 1297 1297 return 1; 1298 1298 } break; … … 1844 1844 int32_t y1=lnumber_value(CAR(args)); args=lcdr(args); 1845 1845 int32_t id=lnumber_value(CAR(args)); 1846 cache.img(id)->put_image( screen,x1,y1,1);1846 cache.img(id)->put_image(main_screen,x1,y1,1); 1847 1847 } break; 1848 1848 case 217 : … … 2044 2044 int32_t cy2=lnumber_value(CAR(args)); args=lcdr(args); 2045 2045 int32_t c1=lnumber_value(CAR(args)); args=lcdr(args); 2046 screen->bar(cx1,cy1,cx2,cy2,c1);2046 main_screen->bar(cx1,cy1,cx2,cy2,c1); 2047 2047 } break; 2048 2048 case 248 : … … 2183 2183 int y=lnumber_value(CAR(args)); 2184 2184 c_target=id; 2185 if ( screen)2185 if (main_screen) 2186 2186 wm->set_mouse_shape(cache.img(c_target)->copy(),x,y); 2187 2187 } break; … … 2204 2204 if (args) 2205 2205 color=lnumber_value(CAR(args)); 2206 fnt->put_string( screen,x,y,st,color);2206 fnt->put_string(main_screen,x,y,st,color); 2207 2207 } break; 2208 2208 case 278 : return ((JCFont *)lpointer_value(CAR(args)))->width(); break; … … 2222 2222 int32_t y2=lnumber_value(CAR(args)); args=CDR(args); 2223 2223 int32_t c=lnumber_value(CAR(args)); 2224 screen->bar(x1,y1,x2,y2,c);2224 main_screen->bar(x1,y1,x2,y2,c); 2225 2225 } break; 2226 2226 case 283 : … … 2231 2231 int32_t y2=lnumber_value(CAR(args)); args=CDR(args); 2232 2232 int32_t c=lnumber_value(CAR(args)); 2233 screen->rectangle(x1,y1,x2,y2,c);2233 main_screen->rectangle(x1,y1,x2,y2,c); 2234 2234 } break; 2235 2235 case 284 : -
abuse/trunk/src/console.cpp
r555 r643 195 195 } 196 196 197 int shell_term::handle_event( event &ev)197 int shell_term::handle_event(Event &ev) 198 198 { 199 199 if (ev.window==con_win && con_win) -
abuse/trunk/src/console.h
r555 r643 48 48 shell_term(JCFont *font, int width, int height, char const *Name); 49 49 virtual ~shell_term() { }; 50 int handle_event( event &ev);50 int handle_event(Event &ev); 51 51 virtual void prompt(); 52 52 virtual void execute(char const *st); -
abuse/trunk/src/cop.cpp
r577 r643 829 829 player_draw(just_fired,o->get_tint()); 830 830 if (o->controller() && o->controller()->local_player()) 831 cache.img(S_health_image)->put_image( screen,o->controller()->cx2-20,831 cache.img(S_health_image)->put_image(main_screen,o->controller()->cx2-20, 832 832 o->controller()->cy1+5,1); 833 833 } break; … … 850 850 o->state=(character_state)old_state; 851 851 if (o->controller() && o->controller()->local_player()) 852 cache.img(S_fast_image)->put_image( screen,o->controller()->cx2-20,852 cache.img(S_fast_image)->put_image(main_screen,o->controller()->cx2-20, 853 853 o->controller()->cy1+5,1); 854 854 } break; … … 871 871 872 872 if (o->controller() && o->controller()->local_player()) 873 cache.img(S_fly_image)->put_image( screen,o->controller()->cx2-20,873 cache.img(S_fly_image)->put_image(main_screen,o->controller()->cx2-20, 874 874 o->controller()->cy1+5,1); 875 875 } break; … … 884 884 885 885 if (o->controller() && o->controller()->local_player()) 886 cache.img(S_sneaky_image)->put_image( screen,o->controller()->cx2-20,886 cache.img(S_sneaky_image)->put_image(main_screen,o->controller()->cx2-20, 887 887 o->controller()->cy1+5,1); 888 888 } break; … … 1031 1031 strcat(msg," <<"); 1032 1032 1033 fnt->put_string( screen,x,y,msg,color);1033 fnt->put_string(main_screen,x,y,msg,color); 1034 1034 y+=fnt->height(); 1035 1035 } … … 1046 1046 fade_out(8); 1047 1047 wm->set_mouse_position(0,0); 1048 screen->clear();1048 main_screen->clear(); 1049 1049 image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1)); 1050 im->put_image( screen,0,0);1051 int x1=im->Size().x+1,y1=0,y2= screen->Size().y;1050 im->put_image(main_screen,0,0); 1051 int x1=im->Size().x+1,y1=0,y2=main_screen->Size().y; 1052 1052 JCFont *fnt=wm->font(); 1053 1053 … … 1057 1057 int y=(y1+y2)/2-(tp+2)*fnt->height()/2,x=x1+10; 1058 1058 char const *header_str = symbol_str("score_header"); 1059 fnt->put_string( screen,x,y,header_str,wm->bright_color());1059 fnt->put_string(main_screen,x,y,header_str,wm->bright_color()); 1060 1060 y+=fnt->height(); 1061 1061 1062 screen->widget_bar(x,y+2,x+strlen(header_str)*fnt->width(),y+fnt->height()-3,1062 main_screen->widget_bar(x,y+2,x+strlen(header_str)*fnt->width(),y+fnt->height()-3, 1063 1063 wm->bright_color(),wm->medium_color(),wm->dark_color()); 1064 1064 y+=fnt->height(); … … 1075 1075 1076 1076 sprintf(msg,"%-17s %3ld %3ld",max_name,(long)v->kills,(long)(v->tkills+v->kills)); 1077 fnt->put_string( screen,x,y,msg,color);1077 fnt->put_string(main_screen,x,y,msg,color); 1078 1078 1079 1079 y+=fnt->height(); -
abuse/trunk/src/demo.cpp
r577 r643 38 38 extern void fade_out(int steps); 39 39 40 void get_event( event &ev)40 void get_event(Event &ev) 41 41 { wm->get_event(ev); 42 42 switch (ev.type) … … 168 168 while (*c) { if (*c=='\\') *c='/'; c++; } 169 169 170 bFILE *probe=open_file(tname,"rb"); // see if the level still ex sist?170 bFILE *probe=open_file(tname,"rb"); // see if the level still exists? 171 171 if (probe->open_failure()) { delete record_file; delete probe; return 0; } 172 172 delete probe; … … 209 209 l_difficulty = initial_difficulty; 210 210 the_game->set_state(MENU_STATE); 211 wm-> push_event(new event(ID_NULL,NULL));211 wm->Push(new Event(ID_NULL,NULL)); 212 212 213 213 view *v=player_list; -
abuse/trunk/src/demo.h
r555 r643 40 40 extern demo_manager demo_man; 41 41 42 extern void get_event( event &ev);42 extern void get_event(Event &ev); 43 43 extern int event_waiting(); 44 44 -
abuse/trunk/src/dev.cpp
r635 r643 181 181 wm->flush_screen(); 182 182 183 event ev;183 Event ev; 184 184 wm->get_event(ev); 185 185 if(ev.type == EV_MESSAGE && ev.message.id == ID_QUIT_OK) … … 257 257 { 258 258 char *name=search_window->read(ID_SEARCH_TEXT); 259 int type=-1; // see if this type ex sists259 int type=-1; // see if this type existss 260 260 int i; 261 261 for (i=0; i<total_objects; i++) … … 265 265 { 266 266 char msg[60]; 267 sprintf(msg,"Object type '%s' does not ex sists!\n",name);267 sprintf(msg,"Object type '%s' does not existss!\n",name); 268 268 the_game->show_help(msg); 269 269 the_game->need_refresh(); … … 295 295 else 296 296 { 297 the_game->show_help("No object matching name ex sistin level\n");297 the_game->show_help("No object matching name exists in level\n"); 298 298 299 299 } … … 339 339 } else 340 340 { 341 event ev;341 Event ev; 342 342 dv->do_command(st,ev); 343 343 } … … 482 482 { 483 483 image *im=cache.img(light_buttons[f->type]); 484 im->put_image( screen,f->x-vx+v->cx1-im->Size().x/2,f->y-vy+v->cy1-im->Size().y/2,1);485 screen->rectangle(f->x1-vx+v->cx1,f->y1-vy+v->cy1,f->x2-vx+v->cx1,f->y2-vy+v->cy1,484 im->put_image(main_screen,f->x-vx+v->cx1-im->Size().x/2,f->y-vy+v->cy1-im->Size().y/2,1); 485 main_screen->rectangle(f->x1-vx+v->cx1,f->y1-vy+v->cy1,f->x2-vx+v->cx1,f->y2-vy+v->cy1, 486 486 wm->medium_color()); 487 487 } … … 493 493 int32_t rx1,ry1; 494 494 the_game->game_to_mouse(link_object->x,link_object->y,v,rx1,ry1); 495 screen->line(rx1,ry1,dlastx,dlasty,yellow);495 main_screen->line(rx1,ry1,dlastx,dlasty,yellow); 496 496 } 497 497 … … 502 502 int32_t rx1,ry1; 503 503 the_game->game_to_mouse(selected_light->x,selected_light->y,v,rx1,ry1); 504 screen->rectangle(rx1-l,ry1-h,rx1+l,ry1+h,wm->bright_color());504 main_screen->rectangle(rx1-l,ry1-h,rx1+l,ry1+h,wm->bright_color()); 505 505 } 506 506 … … 511 511 the_game->game_to_mouse(o->x,o->y,current_view,x1,y1); 512 512 char *nm=object_names[o->otype]; 513 console_font->put_string( screen,x1-strlen(nm)*console_font->width()/2,y1+2,nm);513 console_font->put_string(main_screen,x1-strlen(nm)*console_font->width()/2,y1+2,nm); 514 514 } 515 515 … … 526 526 game_object *other=o->get_object(i); 527 527 the_game->game_to_mouse(other->x,other->y,current_view,x2,y2); 528 screen->line(x1,y1,x2,y2,wm->bright_color());528 main_screen->line(x1,y1,x2,y2,wm->bright_color()); 529 529 } 530 530 … … 533 533 light_source *l=o->get_light(i); 534 534 the_game->game_to_mouse(l->x,l->y,current_view,x2,y2); 535 screen->line(x1,y1,x2,y2,light_connection_color);535 main_screen->line(x1,y1,x2,y2,light_connection_color); 536 536 } 537 537 … … 545 545 the_game->game_to_mouse(x1,y1,v,rx1,ry1); 546 546 the_game->game_to_mouse(x2,y2,v,rx2,ry2); 547 screen->rectangle(rx1,ry1,rx2,ry2,wm->bright_color());547 main_screen->rectangle(rx1,ry1,rx2,ry2,wm->bright_color()); 548 548 549 549 the_game->game_to_mouse(selected_object->x,selected_object->y,current_view,x1,y1); … … 552 552 game_object *other=selected_object->get_object(i); 553 553 the_game->game_to_mouse(other->x,other->y,current_view,x2,y2); 554 screen->line(x1,y1,x2,y2,light_connection_color);554 main_screen->line(x1,y1,x2,y2,light_connection_color); 555 555 } 556 556 } … … 976 976 } 977 977 978 void dev_controll::do_command(char const *command, event &ev)978 void dev_controll::do_command(char const *command, Event &ev) 979 979 { 980 980 char fword[50]; … … 1036 1036 current_level->unactivate_all(); 1037 1037 1038 if ( screen) // don't draw if graphics haven't been setup yet.1038 if (main_screen) // don't draw if graphics haven't been setup yet. 1039 1039 the_game->draw(); 1040 1040 player_list->reset_player(); … … 1516 1516 1517 1517 1518 void dev_controll::area_handle_input( event &ev)1518 void dev_controll::area_handle_input(Event &ev) 1519 1519 { 1520 1520 … … 1554 1554 } 1555 1555 1556 void dev_controll::pick_handle_input( event &ev)1556 void dev_controll::pick_handle_input(Event &ev) 1557 1557 { 1558 1558 area_controller *find=NULL; … … 1627 1627 int sshot_fcount=-1; 1628 1628 1629 void dev_controll::handle_event( event &ev)1629 void dev_controll::handle_event(Event &ev) 1630 1630 { 1631 1631 int32_t x,y; … … 1637 1637 } 1638 1638 1639 if (dev_menu && dev_menu->handle_event(ev, screen)) return ;1639 if (dev_menu && dev_menu->handle_event(ev,main_screen)) return ; 1640 1640 1641 1641 if (!current_level) return ; … … 1652 1652 1653 1653 if (ev.type==EV_KEY && ev.key==JK_F2) 1654 write_PCX( screen,pal,"scrnshot.pcx");1654 write_PCX(main_screen,pal,"scrnshot.pcx"); 1655 1655 else if (ev.type==EV_KEY && ev.key==JK_F3) 1656 1656 { 1657 1657 char name[100]; 1658 1658 sprintf(name,"shot%04d.pcx",screen_shot_on++); 1659 write_PCX( screen,pal,name);1659 write_PCX(main_screen,pal,name); 1660 1660 } else if (ev.type==EV_KEY && ev.key==JK_F5) 1661 1661 { … … 2049 2049 sprintf(cmd,"load %s",mess_win->read(ID_MESS_STR1)); 2050 2050 dev_cont->do_command(cmd,ev); 2051 wm-> push_event(new event(ID_CANCEL,NULL)); // close window2051 wm->Push(new Event(ID_CANCEL,NULL)); // close window 2052 2052 } break; 2053 2053 case ID_GAME_SAVE : … … 2086 2086 { 2087 2087 current_level->set_name(mess_win->read(ID_MESS_STR1)); 2088 wm-> push_event(new event(ID_CANCEL,NULL)); // close window after save2089 wm-> push_event(new event(ID_LEVEL_SAVE,NULL));2088 wm->Push(new Event(ID_CANCEL,NULL)); // close window after save 2089 wm->Push(new Event(ID_LEVEL_SAVE,NULL)); 2090 2090 } 2091 2091 } break; … … 2127 2127 case ID_LEVEL_NEW_OK : 2128 2128 { 2129 wm-> push_event(new event(ID_CANCEL,NULL)); // close_window2129 wm->Push(new Event(ID_CANCEL,NULL)); // close_window 2130 2130 if (current_level) 2131 2131 delete current_level; … … 2153 2153 atoi(mess_win->read(ID_MESS_STR2))); 2154 2154 } else the_game->show_help("Create a level first!"); 2155 wm-> push_event(new event(ID_CANCEL,NULL)); // close_window2155 wm->Push(new Event(ID_CANCEL,NULL)); // close_window 2156 2156 } break; 2157 2157 … … 2201 2201 { 2202 2202 demo_man.set_state(demo_manager::RECORDING,mess_win->read(ID_RECORD_DEMO_FILENAME)); 2203 wm-> push_event(new event(ID_CANCEL,NULL)); // close window2203 wm->Push(new Event(ID_CANCEL,NULL)); // close window 2204 2204 } break; 2205 2205 … … 2258 2258 symbol_str("WARNING")); 2259 2259 wm->grab_focus(warn_win); 2260 } else wm-> push_event(new event(ID_SET_SCROLL_OK,NULL));2260 } else wm->Push(new Event(ID_SET_SCROLL_OK,NULL)); 2261 2261 } break; 2262 2262 case ID_WARN_CANCEL : 2263 2263 { 2264 2264 wm->close_window(warn_win); warn_win=NULL; 2265 wm-> push_event(new event(ID_CANCEL,NULL));2265 wm->Push(new Event(ID_CANCEL,NULL)); 2266 2266 } break; 2267 2267 case ID_SET_SCROLL_OK : … … 2272 2272 bg_ymul=atoi(mess_win->read(ID_MESS_STR3)); 2273 2273 bg_ydiv=atoi(mess_win->read(ID_MESS_STR4)); 2274 wm-> push_event(new event(ID_CANCEL,NULL)); // close window2274 wm->Push(new Event(ID_CANCEL,NULL)); // close window 2275 2275 } break; 2276 2276 … … 2311 2311 char const *s=name; 2312 2312 LObject::Compile(s)->Eval(); 2313 wm-> push_event(new event(ID_CANCEL,NULL)); // close window2313 wm->Push(new Event(ID_CANCEL,NULL)); // close window 2314 2314 } break; 2315 2315 case ID_TOGGLE_DELAY : … … 2324 2324 case ID_CLEAR_WEAPONS : 2325 2325 { 2326 event ev;2326 Event ev; 2327 2327 do_command("clear_weapons",ev); 2328 2328 } break; … … 2761 2761 case 'A' : { if (selected_object) 2762 2762 { 2763 if (oedit) wm-> push_event(new event(DEV_OEDIT_OK,NULL));2763 if (oedit) wm->Push(new Event(DEV_OEDIT_OK,NULL)); 2764 2764 make_ai_window(selected_object); 2765 2765 } … … 2825 2825 if (selected_object && selected_object->controller()==NULL) 2826 2826 { copy_object=selected_object; 2827 wm-> push_event(new event(DEV_OEDIT_COPY,NULL)); } break;2827 wm->Push(new Event(DEV_OEDIT_COPY,NULL)); } break; 2828 2828 2829 2829 case 'D' : the_game->toggle_delay(); break; … … 2872 2872 { 2873 2873 v->god=!v->god; 2874 sbar.redraw( screen);2874 sbar.redraw(main_screen); 2875 2875 } 2876 2876 } break; … … 3026 3026 } 3027 3027 3028 void pal_win::handle_event( event &ev)3028 void pal_win::handle_event(Event &ev) 3029 3029 { 3030 3030 int d=cur_fg; … … 3573 3573 new pmenu_item(symbol_str("file_top"),new psub_menu(i_recurse(filemenu),NULL), 3574 3574 new pmenu_item(symbol_str("edit_top"),new psub_menu(i_recurse(editmenu),NULL), 3575 new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(winmenu),NULL),NULL))), screen);3575 new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(winmenu),NULL),NULL))),main_screen); 3576 3576 } 3577 3577 -
abuse/trunk/src/dev.h
r555 r643 41 41 void open_window(); 42 42 char *name; 43 void handle_event( event &ev);43 void handle_event(Event &ev); 44 44 pal_win(void *args); 45 45 void resize(int xa, int ya); … … 101 101 void show_mem(); 102 102 dev_controll(); 103 void handle_event( event &ev);104 void do_command(char const *st, event &ev);103 void handle_event(Event &ev); 104 void do_command(char const *st, Event &ev); 105 105 int is_pal_win(Jwindow *win); 106 106 void dev_draw(view *v); … … 115 115 int32_t snap_x(int32_t x); 116 116 int32_t snap_y(int32_t y); 117 void area_handle_input( event &ev);118 void pick_handle_input( event &ev);117 void area_handle_input(Event &ev); 118 void pick_handle_input(Event &ev); 119 119 void close_area_win(int read_values); 120 120 void notify_deleted_object(game_object *o); -
abuse/trunk/src/devsel.cpp
r555 r643 147 147 148 148 149 void tile_picker::handle_inside_event( event &ev, image *screen, InputManager *inm)149 void tile_picker::handle_inside_event(Event &ev, image *screen, InputManager *inm) 150 150 { 151 151 if (ev.type==EV_MOUSE_BUTTON) -
abuse/trunk/src/devsel.h
r555 r643 19 19 tile_picker(int X, int Y, int ID, int spec_type, 20 20 int scale, int scroll_h, int Wid, ifield *Next); 21 virtual void handle_inside_event( event &ev, image *screen, InputManager *inm);21 virtual void handle_inside_event(Event &ev, image *screen, InputManager *inm); 22 22 virtual void scroll_event(int newx, image *screen); 23 23 virtual char *read() { return (char *)this; } -
abuse/trunk/src/director.cpp
r555 r643 44 44 { 45 45 int cx1, cy1, cx2, cy2, word_size, word_len; 46 screen->GetClip(cx1, cy1, cx2, cy2);47 screen->InClip(x1,y1,x2+1,y2+1);46 main_screen->GetClip(cx1, cy1, cx2, cy2); 47 main_screen->InClip(x1,y1,x2+1,y2+1); 48 48 int h=font->height()+2,w=font->width(),x=x1,dist; 49 49 y+=y1; … … 107 107 while (word_len--) 108 108 { 109 font->put_char( screen,x+1,y+1,*word_start,0);110 font->put_char( screen,x,y,*word_start,c);109 font->put_char(main_screen,x+1,y+1,*word_start,0); 110 font->put_char(main_screen,x,y,*word_start,c); 111 111 word_start++; 112 112 x+=w; … … 115 115 116 116 } 117 screen->SetClip(cx1,cy1,cx2,cy2);117 main_screen->SetClip(cx1,cy1,cx2,cy2); 118 118 return (y<=y1); 119 119 } … … 179 179 while (wm->event_waiting()) 180 180 { 181 event ev;181 Event ev; 182 182 wm->get_event(ev); 183 183 if (ev.type==EV_KEY) -
abuse/trunk/src/endgame.cpp
r590 r643 185 185 186 186 187 screen->clear();187 main_screen->clear(); 188 188 int c[4]={ pal->find_closest(222,222,22), 189 189 pal->find_closest(200,200,200), … … 197 197 *(si++)=jrand()%200; 198 198 *(si++)=c[jrand()%4]; 199 screen->PutPixel(vec2i(si[-3],si[-2]),si[-1]);199 main_screen->PutPixel(vec2i(si[-3],si[-2]),si[-1]); 200 200 } 201 201 int32_t paddr[256]; … … 214 214 215 215 216 scan_map( screen,ex,ey,cache.img(planet),cache.img(planet2),0,paddr,p,cache.img(mask)->Size().y,eoff,coff);216 scan_map(main_screen,ex,ey,cache.img(planet),cache.img(planet2),0,paddr,p,cache.img(mask)->Size().y,eoff,coff); 217 217 image *tcopy=cache.img(planet)->copy(); 218 218 fade_in(NULL,32); … … 231 231 232 232 old_time.get_time(); 233 screen->clear();233 main_screen->clear(); 234 234 int j; 235 235 for (si=sinfo,j=0; j<800; j++,si+=3) 236 screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);236 main_screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]); 237 237 238 238 if (i>=30 && i<=37) … … 240 240 cache.img(planet)->put_image(tcopy,0,0); 241 241 cache.fig(explo_frames1[i-30])->forward->PutImage(tcopy,vec2i(100,50)); 242 scan_map( screen,ex,ey,tcopy,242 scan_map(main_screen,ex,ey,tcopy, 243 243 cache.img(planet2), 244 244 0,paddr, … … 246 246 } 247 247 else 248 scan_map( screen,ex,ey,cache.img(planet),248 scan_map(main_screen,ex,ey,cache.img(planet), 249 249 cache.img(planet2), 250 250 0,paddr, … … 258 258 259 259 260 scale_put_trans(s, screen,ex-(i-38)*5,ey+cache.img(mask)->Size().y/2+t*4,nw,nh);260 scale_put_trans(s,main_screen,ex-(i-38)*5,ey+cache.img(mask)->Size().y/2+t*4,nw,nh); 261 261 if (i==77) 262 262 if (sound_avail&SFX_INITIALIZED) … … 283 283 284 284 old_time.get_time(); 285 screen->clear();285 main_screen->clear(); 286 286 int j; 287 287 for (si=sinfo,j=0; j<800; j++,si+=3) 288 screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);289 290 291 scan_map( screen,ex,ey,cache.img(planet),288 main_screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]); 289 290 291 scan_map(main_screen,ex,ey,cache.img(planet), 292 292 cache.img(planet2),i*256/200,paddr,p,cache.img(mask)->Size().y,eoff,coff); 293 293 … … 322 322 last=c; 323 323 if (c->char_num) 324 cache.fig(explo_frames2[c->frame])->forward->PutImage( screen,vec2i(c->x,c->y));324 cache.fig(explo_frames2[c->frame])->forward->PutImage(main_screen,vec2i(c->x,c->y)); 325 325 326 326 c->x-=3; … … 337 337 while (clist) { ex_char *p=clist; clist=clist->next; delete p; } 338 338 339 screen->clear();339 main_screen->clear(); 340 340 int j; 341 341 for (si=sinfo,j=0; j<800; j++,si+=3) 342 screen->PutPixel(vec2i(si[0],si[1]),si[2]);343 344 event ev;342 main_screen->PutPixel(vec2i(si[0],si[1]),si[2]); 343 344 Event ev; 345 345 i=0; 346 346 do … … 353 353 354 354 old_time.get_time(); 355 scan_map( screen,ex,ey,cache.img(planet),355 scan_map(main_screen,ex,ey,cache.img(planet), 356 356 cache.img(planet2), 357 357 256,paddr, … … 381 381 for (i=0; i<320 && ev.type!=EV_KEY; i++) 382 382 { 383 screen->clear();383 main_screen->clear(); 384 384 int j; 385 385 for (si=sinfo,j=0; j<800; j++,si+=3) 386 screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);387 388 scan_map( screen,ex,ey,cache.img(planet),386 main_screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]); 387 388 scan_map(main_screen,ex,ey,cache.img(planet), 389 389 cache.img(planet2), 390 390 256,paddr, … … 412 412 413 413 fade_out(16); 414 screen->clear();414 main_screen->clear(); 415 415 416 416 … … 426 426 image blank(vec2i(2, 2)); blank.clear(); 427 427 wm->set_mouse_shape(blank.copy(),0,0); // don't show mouse 428 screen->clear();428 main_screen->clear(); 429 429 430 430 image *im=cache.img(cache.reg("art/fore/endgame.spe","tbc",SPEC_IMAGE,1)); … … 437 437 438 438 int dx=(xres+1)/2-im->Size().x/2,dy=(yres+1)/2-im->Size().y/2; 439 im->put_image( screen,dx,dy);440 console_font->put_string( screen,xres/2+35,yres/2+100-console_font->height()-2,439 im->put_image(main_screen,dx,dy); 440 console_font->put_string(main_screen,xres/2+35,yres/2+100-console_font->height()-2, 441 441 lstring_value(to_be)); 442 442 fade_in(NULL,32); … … 447 447 cmap[i]=pal->find_closest(i*256/32,i*256/32,i*256/32); 448 448 449 event ev; ev.type=EV_SPURIOUS;449 Event ev; ev.type=EV_SPURIOUS; 450 450 time_marker start; 451 451 for (i=0; i<320 && ev.type!=EV_KEY; i++) 452 452 { 453 im->put_image( screen,dx,dy);454 console_font->put_string( screen,xres/2+35,yres/2+100-console_font->height()-2,453 im->put_image(main_screen,dx,dy); 454 console_font->put_string(main_screen,xres/2+35,yres/2+100-console_font->height()-2, 455 455 lstring_value(to_be)); 456 456 … … 473 473 wm->set_mouse_shape(blank.copy(),0,0); // don't show mouse 474 474 show_sell(1); 475 wm-> push_event(new event(ID_SHOW_SELL,NULL));475 wm->Push(new Event(ID_SHOW_SELL,NULL)); 476 476 } 477 477 … … 482 482 image blank(vec2i(2, 2)); blank.clear(); 483 483 wm->set_mouse_shape(blank.copy(),0,0); // don't show mouse 484 screen->clear();484 main_screen->clear(); 485 485 486 486 image *im=cache.img(cache.reg("art/fore/endgame.spe","end.pcx",SPEC_IMAGE,1)); … … 499 499 cmap[i]=pal->find_closest(i*256/32,i*256/32,i*256/32); 500 500 501 event ev; ev.type=EV_SPURIOUS;501 Event ev; ev.type=EV_SPURIOUS; 502 502 time_marker start; 503 503 for (i=0; i<320 && ev.type!=EV_KEY; i++) 504 504 { 505 im->put_image( screen,dx,dy);505 im->put_image(main_screen,dx,dy); 506 506 507 507 text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(end_plot),wm->font(),cmap,wm->bright_color()); … … 524 524 525 525 fade_out(16); 526 screen->clear();526 main_screen->clear(); 527 527 528 528 show_sell(1); -
abuse/trunk/src/game.cpp
r641 r643 120 120 Jwindow *no_space = wm->new_window(0, 0, -1, -1, b, "ERROR"); 121 121 122 event ev;122 Event ev; 123 123 do 124 124 { … … 461 461 } 462 462 463 void Game::joy_calb( event &ev)463 void Game::joy_calb(Event &ev) 464 464 { 465 465 if(!joy_win) // make sure the joystick calibration window is open … … 490 490 } 491 491 492 void Game::menu_select( event &ev)492 void Game::menu_select(Event &ev) 493 493 { 494 494 state = DEV_MOUSE_RELEASE; … … 496 496 { 497 497 #if 0 498 wm-> push_event(new event(men_mess[((pick_list *)ev.message.data)->get_selection()], NULL));498 wm->Push(new Event(men_mess[((pick_list *)ev.message.data)->get_selection()], NULL)); 499 499 wm->close_window(top_menu); 500 500 top_menu = NULL; … … 581 581 yoff / ftile_height()>y || yoff / ftile_height()+(viewy2 - viewy1)/ftile_height()+1 < y) return; 582 582 int cx1, cy1, cx2, cy2; 583 screen->GetClip(cx1, cy1, cx2, cy2);584 screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1);585 im->PutImage( screen, vec2i((x - xoff / ftile_width())*ftile_width()+viewx1 - xoff % ftile_width(),583 main_screen->GetClip(cx1, cy1, cx2, cy2); 584 main_screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1); 585 im->PutImage(main_screen, vec2i((x - xoff / ftile_width())*ftile_width()+viewx1 - xoff % ftile_width(), 586 586 (y - yoff / ftile_height())*ftile_height()+viewy1 - yoff % ftile_height())); 587 screen->SetClip(cx1, cy1, cx2, cy2);587 main_screen->SetClip(cx1, cy1, cx2, cy2); 588 588 } 589 589 } … … 603 603 yo / btile_height()>y || yo / btile_height()+(viewy2 - viewy1)/btile_height()+1 < y) return; 604 604 int cx1, cy1, cx2, cy2; 605 screen->GetClip(cx1, cy1, cx2, cy2);606 screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1);607 im->put_image( screen, (x - xo / btile_width())*btile_width()+viewx1 - xo % btile_width(),605 main_screen->GetClip(cx1, cy1, cx2, cy2); 606 main_screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1); 607 im->put_image(main_screen, (x - xo / btile_width())*btile_width()+viewx1 - xo % btile_width(), 608 608 (y - yo / btile_height())*btile_height()+viewy1 - yo % btile_height(), 0); 609 screen->SetClip(cx1, cy1, cx2, cy2);609 main_screen->SetClip(cx1, cy1, cx2, cy2); 610 610 } 611 611 } … … 633 633 int xs, ys; 634 634 if(mousex < xmargin && dev_cont->ok_to_scroll()) xs = -18; 635 else if(mousex>( screen->Size().x-xmargin) && dev_cont->ok_to_scroll()) xs = 18;635 else if(mousex>(main_screen->Size().x-xmargin) && dev_cont->ok_to_scroll()) xs = 18; 636 636 else if(wm->key_pressed(JK_LEFT) && !last_input && !dev_cont->need_arrows()) 637 637 xs = -18; … … 642 642 643 643 if(mousey < ymargin && dev_cont->ok_to_scroll()) ys = -18; 644 else if(mousey>( screen->Size().y-ymargin) && dev_cont->ok_to_scroll()) ys = 18;644 else if(mousey>(main_screen->Size().y-ymargin) && dev_cont->ok_to_scroll()) ys = 18; 645 645 else if(wm->key_pressed(JK_UP) && !last_input) 646 646 ys = -18; … … 698 698 if(DEFINEDP(l_post_render->GetFunction())) 699 699 { 700 screen->dirt_off();700 main_screen->dirt_off(); 701 701 LSpace::Tmp.Clear(); 702 702 l_post_render->EvalFunction(NULL); 703 703 LSpace::Tmp.Clear(); 704 screen->dirt_on();704 main_screen->dirt_on(); 705 705 } 706 706 } … … 711 711 int x1, y1, x2, y2, x, y, xo, yo, nxoff, nyoff; 712 712 int cx1, cy1, cx2, cy2; 713 screen->GetClip(cx1, cy1, cx2, cy2);713 main_screen->GetClip(cx1, cy1, cx2, cy2); 714 714 715 715 if(!current_level || state == MENU_STATE) … … 718 718 { 719 719 if(state == SCENE_STATE) 720 screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);720 main_screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1); 721 721 image *tit = cache.img(title_screen); 722 tit->put_image( screen,screen->Size().x/2 - tit->Size().x/2,723 screen->Size().y/2 - tit->Size().y/2);722 tit->put_image(main_screen, main_screen->Size().x/2 - tit->Size().x/2, 723 main_screen->Size().y/2 - tit->Size().y/2); 724 724 if(state == SCENE_STATE) 725 screen->SetClip(cx1, cy1, cx2, cy2);725 main_screen->SetClip(cx1, cy1, cx2, cy2); 726 726 wm->flush_screen(); 727 727 } … … 736 736 737 737 if(small_render) 738 screen->AddDirty(v->cx1, v->cy1, (v->cx2 - v->cx1 + 1)*2 + v->cx1 + 1, v->cy1+(v->cy2 - v->cy1 + 1)*2 + 1);738 main_screen->AddDirty(v->cx1, v->cy1, (v->cx2 - v->cx1 + 1)*2 + v->cx1 + 1, v->cy1+(v->cy2 - v->cy1 + 1)*2 + 1); 739 739 else 740 screen->AddDirty(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);740 main_screen->AddDirty(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1); 741 741 742 742 if(v->draw_solid != -1) // fill the screen and exit.. 743 743 { 744 744 int c = v->draw_solid; 745 screen->Lock();745 main_screen->Lock(); 746 746 for(int y = v->cy1; y <= v->cy2; y++) 747 memset( screen->scan_line(y)+v->cx1, c, v->cx2 - v->cx1 + 1);748 screen->Unlock();747 memset(main_screen->scan_line(y)+v->cx1, c, v->cx2 - v->cx1 + 1); 748 main_screen->Unlock(); 749 749 v->draw_solid = -1; 750 750 return; … … 765 765 v->cy2 = small_render->Size().y-1; 766 766 767 old_screen = screen;768 screen = small_render;767 old_screen = main_screen; 768 main_screen = small_render; 769 769 } else 770 screen->dirt_off();770 main_screen->dirt_off(); 771 771 772 772 … … 788 788 current_vyadd = yoff - v->cy1; 789 789 790 screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);790 main_screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1); 791 791 792 792 nxoff = xoff * bg_xmul / bg_xdiv; … … 828 828 else bt = get_bg(0); 829 829 830 bt->im->put_image( screen, draw_x, draw_y);830 bt->im->put_image(main_screen, draw_x, draw_y); 831 831 // if(!(dev & EDIT_MODE) && bt->next) 832 832 // current_level->put_bg(x, y, bt->next); … … 890 890 { 891 891 int ncx1, ncy1, ncx2, ncy2; 892 screen->GetClip(ncx1, ncy1, ncx2, ncy2);893 894 int scr_w = screen->Size().x;892 main_screen->GetClip(ncx1, ncy1, ncx2, ncy2); 893 894 int scr_w = main_screen->Size().x; 895 895 if(dev & MAP_MODE) 896 896 { 897 897 if(dev & EDIT_MODE) 898 screen->clear(wm->bright_color());898 main_screen->clear(wm->bright_color()); 899 899 else 900 screen->clear(wm->black());901 screen->Lock();900 main_screen->clear(wm->black()); 901 main_screen->Lock(); 902 902 for(y = y1, draw_y = yo; y <= y2; y++, draw_y += yinc) 903 903 { … … 905 905 { 906 906 uint16_t *cl = current_level->get_fgline(y)+x1; 907 uint8_t *sl1 = screen->scan_line(draw_y)+xo;907 uint8_t *sl1 = main_screen->scan_line(draw_y)+xo; 908 908 for(x = x1, draw_x = xo; x <= x2; x++, cl++, sl1 += xinc, draw_x += xinc) 909 909 { … … 924 924 } 925 925 } 926 screen->Unlock();926 main_screen->Unlock(); 927 927 928 928 if(dev & EDIT_MODE) … … 952 952 if(fort_num != BLACK) 953 953 { 954 get_fg(fort_num)->im->PutImage( screen, vec2i(draw_x, draw_y));954 get_fg(fort_num)->im->PutImage(main_screen, vec2i(draw_x, draw_y)); 955 955 956 956 if(!(dev & EDIT_MODE)) … … 994 994 { 995 995 if(dev & DRAW_BG_LAYER) 996 get_fg(fort_num)->im->PutImage( screen, vec2i(draw_x, draw_y));996 get_fg(fort_num)->im->PutImage(main_screen, vec2i(draw_x, draw_y)); 997 997 else 998 get_fg(fort_num)->im->PutFilled( screen, vec2i(draw_x, draw_y), 0);998 get_fg(fort_num)->im->PutFilled(main_screen, vec2i(draw_x, draw_y), 0); 999 999 1000 1000 if(!(dev & EDIT_MODE)) … … 1002 1002 else 1003 1003 { 1004 screen->line(draw_x, draw_y, draw_x + xinc, draw_y + yinc, wm->bright_color());1005 screen->line(draw_x + xinc, draw_y, draw_x, draw_y + yinc, wm->bright_color());1004 main_screen->line(draw_x, draw_y, draw_x + xinc, draw_y + yinc, wm->bright_color()); 1005 main_screen->line(draw_x + xinc, draw_y, draw_x, draw_y + yinc, wm->bright_color()); 1006 1006 } 1007 1007 } … … 1037 1037 { 1038 1038 d += 2; 1039 screen->line(draw_x+*(d - 2), draw_y+*(d - 1), draw_x+*d, draw_y+*(d + 1), b);1039 main_screen->line(draw_x+*(d - 2), draw_y+*(d - 1), draw_x+*d, draw_y+*(d + 1), b); 1040 1040 } 1041 screen->line(draw_x+*d, draw_y+*(d - 1), draw_x + p->data[0], draw_y + p->data[1], b);1041 main_screen->line(draw_x+*d, draw_y+*(d - 1), draw_x + p->data[0], draw_y + p->data[1], b); 1042 1042 } 1043 1043 } … … 1063 1063 int x1 = v->cx1, y1 = v->cy1, x2 = v->cx2, y2 = v->cy1 + wm->font()->height()+10; 1064 1064 1065 remap_area( screen, x1, y1, x2, y2, white_light + 40 * 256);1066 screen->bar(x1, y1, x2, y1, color);1067 screen->bar(x1, y2, x2, y2, color);1068 1069 wm->font()->put_string( screen, x1 + 5, y1 + 5,1065 remap_area(main_screen, x1, y1, x2, y2, white_light + 40 * 256); 1066 main_screen->bar(x1, y1, x2, y1, color); 1067 main_screen->bar(x1, y2, x2, y2, color); 1068 1069 wm->font()->put_string(main_screen, x1 + 5, y1 + 5, 1070 1070 help_text, color); 1071 1071 if(color > 30) … … 1079 1079 dev_cont->dev_draw(v); 1080 1080 if(cache.in_use()) 1081 cache.img(vmm_image)->put_image( screen, v->cx1, v->cy2 - cache.img(vmm_image)->Size().y+1);1081 cache.img(vmm_image)->put_image(main_screen, v->cx1, v->cy2 - cache.img(vmm_image)->Size().y+1); 1082 1082 1083 1083 if(dev & DRAW_LIGHTS) … … 1085 1085 if(small_render) 1086 1086 { 1087 double_light_screen( screen, xoff, yoff, white_light, v->ambient, old_screen, old_cx1, old_cy1);1087 double_light_screen(main_screen, xoff, yoff, white_light, v->ambient, old_screen, old_cx1, old_cy1); 1088 1088 1089 1089 v->cx1 = old_cx1; … … 1091 1091 v->cx2 = old_cx2; 1092 1092 v->cy2 = old_cy2; 1093 screen = old_screen;1093 main_screen = old_screen; 1094 1094 } else 1095 1095 { 1096 screen->dirt_on();1096 main_screen->dirt_on(); 1097 1097 if(xres * yres <= 64000) 1098 light_screen( screen, xoff, yoff, white_light, v->ambient);1099 else light_screen( screen, xoff, yoff, white_light, 63); // no lighting for hi - rez1098 light_screen(main_screen, xoff, yoff, white_light, v->ambient); 1099 else light_screen(main_screen, xoff, yoff, white_light, 63); // no lighting for hi - rez 1100 1100 } 1101 1101 1102 1102 } else 1103 screen->dirt_on();1103 main_screen->dirt_on(); 1104 1104 1105 1105 1106 1106 1107 1107 } else 1108 screen->dirt_on();1108 main_screen->dirt_on(); 1109 1109 1110 1110 rand_on = ro; // restore random start in case in draw funs moved it … … 1113 1113 post_render(); 1114 1114 1115 screen->SetClip(cx1, cy1, cx2 + 1, cy2 + 1);1115 main_screen->SetClip(cx1, cy1, cx2 + 1, cy2 + 1); 1116 1116 1117 1117 … … 1149 1149 } 1150 1150 1151 int Game::in_area( event &ev, int x1, int y1, int x2, int y2)1151 int Game::in_area(Event &ev, int x1, int y1, int x2, int y2) 1152 1152 { 1153 1153 return (last_demo_mx >= x1 && last_demo_mx <= x2 && … … 1171 1171 if (im) 1172 1172 { 1173 screen->clear();1174 im->put_image( screen, (xres + 1) / 2 - im->Size().x / 2,1173 main_screen->clear(); 1174 im->put_image(main_screen, (xres + 1) / 2 - im->Size().x / 2, 1175 1175 (yres + 1) / 2 - im->Size().y / 2); 1176 1176 } … … 1194 1194 if (N == 0) 1195 1195 { 1196 screen->clear();1196 main_screen->clear(); 1197 1197 wm->flush_screen(); 1198 1198 old_pal->load(); … … 1268 1268 } 1269 1269 1270 screen->clear();1270 main_screen->clear(); 1271 1271 pal->load(); 1272 1272 1273 1273 int dx = (xres + 1) / 2 - gray->Size().x / 2, dy = (yres + 1) / 2 - gray->Size().y / 2; 1274 gray->put_image( screen, dx, dy);1275 smoke[0]->put_image( screen, dx + 24, dy + 5);1274 gray->put_image(main_screen, dx, dy); 1275 smoke[0]->put_image(main_screen, dx + 24, dy + 5); 1276 1276 1277 1277 fade_in(NULL, 16); … … 1280 1280 cmap[i] = pal->find_closest(i * 256 / 32, i * 256 / 32, i * 256 / 32); 1281 1281 1282 event ev;1282 Event ev; 1283 1283 ev.type = EV_SPURIOUS; 1284 1284 Timer total; … … 1293 1293 break; 1294 1294 1295 gray->put_image( screen, dx, dy);1296 smoke[i % 5]->put_image( screen, dx + 24, dy + 5);1295 gray->put_image(main_screen, dx, dy); 1296 smoke[i % 5]->put_image(main_screen, dx + 24, dy + 5); 1297 1297 text_draw(205 - i, dx + 15, dy, dx + 320 - 15, dy + 199, str, wm->font(), cmap, wm->bright_color()); 1298 1298 wm->flush_screen(); … … 1446 1446 console_font = new JCFont(cache.img(console_font_pict)); 1447 1447 1448 wm = new WindowManager( screen, pal, bright_color,1448 wm = new WindowManager(main_screen, pal, bright_color, 1449 1449 med_color, dark_color, game_font); 1450 1450 … … 1496 1496 else 1497 1497 { 1498 screen->clear();1498 main_screen->clear(); 1499 1499 if(title_screen >= 0) 1500 1500 { 1501 1501 image *tit = cache.img(title_screen); 1502 tit->put_image( screen,screen->Size().x/2 - tit->Size().x/2,1503 screen->Size().y/2 - tit->Size().y/2);1502 tit->put_image(main_screen, main_screen->Size().x/2 - tit->Size().x/2, 1503 main_screen->Size().y/2 - tit->Size().y/2); 1504 1504 } 1505 1505 set_state(MENU_STATE); // then go to menu state so windows will turn off … … 1524 1524 char str[16]; 1525 1525 sprintf(str, "%ld", (long)(10000.0f / avg_ms)); 1526 console_font->put_string( screen, first_view->cx1, first_view->cy1, str);1526 console_font->put_string(main_screen, first_view->cx1, first_view->cy1, str); 1527 1527 1528 1528 sprintf(str, "%d", total_active); 1529 console_font->put_string( screen, first_view->cx1, first_view->cy1 + 10, str);1529 console_font->put_string(main_screen, first_view->cx1, first_view->cy1 + 10, str); 1530 1530 } 1531 1531 … … 1573 1573 { 1574 1574 for(view *f = first_view; f; f = f->next) 1575 cache.img(pause_image)->put_image( screen, (f->cx1 + f->cx2)/2 - cache.img(pause_image)->Size().x/2,1575 cache.img(pause_image)->put_image(main_screen, (f->cx1 + f->cx2)/2 - cache.img(pause_image)->Size().x/2, 1576 1576 f->cy1 + 5, 1); 1577 1577 } … … 1649 1649 void Game::get_input() 1650 1650 { 1651 event ev;1651 Event ev; 1652 1652 idle_ticks++; 1653 1653 while(event_waiting()) … … 1713 1713 { 1714 1714 if(v->local_player() && v->handle_event(ev)) 1715 ev.type = EV_SPURIOUS; // if the event was used by the view, gobble it up1715 ev.type = EV_SPURIOUS; // if the Event was used by the view, gobble it up 1716 1716 } 1717 1717 … … 1806 1806 case 'v': 1807 1807 { 1808 wm-> push_event(new event(DO_VOLUME, NULL));1808 wm->Push(new Event(DO_VOLUME, NULL)); 1809 1809 } break; 1810 1810 case 'p': … … 1821 1821 if(start_edit) 1822 1822 { 1823 wm-> push_event(new event(ID_LEVEL_SAVE, NULL));1823 wm->Push(new Event(ID_LEVEL_SAVE, NULL)); 1824 1824 } 1825 1825 } break; … … 1865 1865 case EV_REDRAW: 1866 1866 { 1867 screen->AddDirty(ev.redraw.x1, ev.redraw.y1,1867 main_screen->AddDirty(ev.redraw.x1, ev.redraw.y1, 1868 1868 ev.redraw.x2 + 1, ev.redraw.y2 + 1); 1869 1869 } break; … … 2033 2033 } else if(state == JOY_CALB_STATE) 2034 2034 { 2035 event ev;2035 Event ev; 2036 2036 joy_calb(ev); 2037 2037 } else if(state == MENU_STATE) … … 2128 2128 void Game::draw(int scene_mode) 2129 2129 { 2130 screen->AddDirty(0, 0, xres + 1, yres + 1);2131 2132 screen->clear();2130 main_screen->AddDirty(0, 0, xres + 1, yres + 1); 2131 2132 main_screen->clear(); 2133 2133 2134 2134 if(scene_mode) 2135 2135 { 2136 2136 char const *helpstr = "ARROW KEYS CHANGE TEXT SPEED"; 2137 wm->font()->put_string( screen,screen->Size().x/2-(wm->font()->width()*strlen(helpstr))/2 + 1,2138 screen->Size().y-wm->font()->height()-5 + 1, helpstr, wm->dark_color());2139 wm->font()->put_string( screen,screen->Size().x/2-(wm->font()->width()*strlen(helpstr))/2,2140 screen->Size().y-wm->font()->height()-5, helpstr, wm->bright_color());2137 wm->font()->put_string(main_screen, main_screen->Size().x/2-(wm->font()->width()*strlen(helpstr))/2 + 1, 2138 main_screen->Size().y-wm->font()->height()-5 + 1, helpstr, wm->dark_color()); 2139 wm->font()->put_string(main_screen, main_screen->Size().x/2-(wm->font()->width()*strlen(helpstr))/2, 2140 main_screen->Size().y-wm->font()->height()-5, helpstr, wm->bright_color()); 2141 2141 } 2142 2142 /* else 2143 2143 { 2144 2144 char *helpstr="PRESS h FOR HELP"; 2145 wm->font()->put_string( screen,screen->Size().x-wm->font()->width()*strlen(helpstr)-5,2146 screen->Size().y-wm->font()->height()-5, helpstr);2145 wm->font()->put_string(main_screen, main_screen->Size().x-wm->font()->width()*strlen(helpstr)-5, 2146 main_screen->Size().y-wm->font()->height()-5, helpstr); 2147 2147 }*/ 2148 2148 /* int dc = cache.img(window_colors)->pixel(0, 2); 2149 2149 int mc = cache.img(window_colors)->pixel(1, 2); 2150 2150 int bc = cache.img(window_colors)->pixel(2, 2); 2151 screen->line(0, 0,screen->Size().x-1, 0, dc);2152 screen->line(0, 0, 0,screen->Size().y-1, dc);2153 screen->line(0, screen->Size().y-1, screen->Size().x-1,screen->Size().y-1, bc);2154 screen->line(screen->Size().x-1, 0, screen->Size().x-1,screen->Size().y-1, bc); */2151 main_screen->line(0, 0, main_screen->Size().x-1, 0, dc); 2152 main_screen->line(0, 0, 0, main_screen->Size().y-1, dc); 2153 main_screen->line(0, main_screen->Size().y-1, main_screen->Size().x-1, main_screen->Size().y-1, bc); 2154 main_screen->line(main_screen->Size().x-1, 0, main_screen->Size().x-1, main_screen->Size().y-1, bc); */ 2155 2155 2156 2156 for(view *f = first_view; f; f = f->next) 2157 2157 draw_map(f, 0); 2158 2158 2159 sbar.redraw( screen);2159 sbar.redraw(main_screen); 2160 2160 } 2161 2161 … … 2204 2204 dev_console->show(); 2205 2205 int t = 0; 2206 event ev;2206 Event ev; 2207 2207 do 2208 2208 { -
abuse/trunk/src/game.h
r555 r643 132 132 133 133 134 int in_area( event &ev, int x1, int y1, int x2, int y2);134 int in_area(Event &ev, int x1, int y1, int x2, int y2); 135 135 void load_level(char const *name); 136 136 void set_level(level *nl); … … 145 145 void get_input(); 146 146 void do_intro(); 147 void joy_calb( event &ev);148 void menu_select( event &ev2);147 void joy_calb(Event &ev); 148 void menu_select(Event &ev2); 149 149 int can_morph_into(int type); 150 150 void morph_into(int type); -
abuse/trunk/src/gamma.cpp
r635 r643 150 150 Jwindow *gw = wm->new_window(xres / 2 - 190, yres / 2 - 90, -1, -1, gp); 151 151 152 event ev;152 Event ev; 153 153 wm->flush_screen(); 154 154 #if !defined __CELLOS_LV2__ -
abuse/trunk/src/gui.cpp
r579 r643 73 73 } 74 74 75 void ico_switch_button::handle_event( event &ev, image *screen, InputManager *im)75 void ico_switch_button::handle_event(Event &ev, image *screen, InputManager *im) 76 76 { 77 77 if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON && … … 92 92 93 93 if (active!=act && activate_id!=-1 && active) 94 wm-> push_event(new event(activate_id,NULL));94 wm->Push(new Event(activate_id,NULL)); 95 95 96 96 if (up && !active) … … 103 103 104 104 if (act!=active && active && activate_id!=-1) 105 wm-> push_event(new event(activate_id,NULL));105 wm->Push(new Event(activate_id,NULL)); 106 106 act=active; 107 107 … … 121 121 extern int sfx_volume; 122 122 123 void ico_button::handle_event( event &ev, image *screen, InputManager *im)123 void ico_button::handle_event(Event &ev, image *screen, InputManager *im) 124 124 { 125 125 if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON && … … 130 130 up=!up; 131 131 draw(act,screen); 132 wm-> push_event(new event(id,(char *)this));132 wm->Push(new Event(id,(char *)this)); 133 133 if (S_BUTTON_PRESS_SND) 134 134 cache.sfx(S_BUTTON_PRESS_SND)->play(sfx_volume); -
abuse/trunk/src/gui.h
r555 r643 25 25 virtual void draw_first(image *screen) { draw(0,screen); } 26 26 virtual void draw(int active, image *screen); 27 virtual void handle_event( event &ev, image *screen, InputManager *im);27 virtual void handle_event(Event &ev, image *screen, InputManager *im); 28 28 29 29 virtual char *read() { return (char *)&up; } … … 44 44 virtual void draw_first(image *screen) { cur_but->draw_first(screen); } 45 45 virtual void draw(int active, image *screen) { cur_but->draw(active,screen); act=active; } 46 virtual void handle_event( event &ev, image *screen, InputManager *im);46 virtual void handle_event(Event &ev, image *screen, InputManager *im); 47 47 virtual ifield *unlink(int id); 48 48 virtual char *read() { return cur_but->read(); } -
abuse/trunk/src/help.cpp
r555 r643 31 31 int x1=xres/2-im->Size().x/2,y1=yres/2-im->Size().y/2; 32 32 int x2=x1+im->Size().x,y2=y1+im->Size().y; 33 im->put_image( screen,x1,y1);34 screen->bar(0,0,x1-1,yres,0);35 screen->bar(0,0,xres,y1-1,0);36 screen->bar(x2,y1,xres,yres,0);37 screen->bar(x1,y2,x2,yres,0);33 im->put_image(main_screen,x1,y1); 34 main_screen->bar(0,0,x1-1,yres,0); 35 main_screen->bar(0,0,xres,y1-1,0); 36 main_screen->bar(x2,y1,xres,yres,0); 37 main_screen->bar(x1,y2,x2,yres,0); 38 38 } 39 39 40 void help_handle_event( event &ev)40 void help_handle_event(Event &ev) 41 41 { 42 42 if (ev.window!=NULL) return ; -
abuse/trunk/src/help.h
r555 r643 16 16 extern int total_help_screens; 17 17 extern int *help_screens; 18 void help_handle_event( event &ev);18 void help_handle_event(Event &ev); 19 19 void draw_help(); // called from game draw if in help mode 20 20 -
abuse/trunk/src/imlib/Makefile.am
r605 r643 26 26 jwindow.cpp jwindow.h \ 27 27 video.cpp video.h \ 28 event.h mouse.h timing.h jdir.h visobj.h \ 28 event.cpp event.h \ 29 mouse.h timing.h jdir.h visobj.h \ 29 30 $(NULL) 30 31 -
abuse/trunk/src/imlib/event.h
r555 r643 32 32 class Jwindow; 33 33 34 class event : public linked_node34 class Event : public linked_node 35 35 { 36 public : 37 int type; 38 struct { int x,y; } mouse_move; 39 int mouse_button; 40 int key; 41 struct { char alt,ctrl,shift; } key_special; 42 struct { int x1,y1,x2,y2; 43 void *start; } redraw; 44 Jwindow *window; // NULL is root 45 struct { int x,y; } window_position; 46 struct { int id; char *data; } message; 47 event(int id, char *data) { type=EV_MESSAGE; message.id=id; message.data=data; } 48 event() { type=EV_SPURIOUS; } 49 } ; 36 public: 37 Event() 38 { 39 type = EV_SPURIOUS; 40 } 50 41 51 class event_handler 42 Event(int id, char *data) 43 { 44 type = EV_MESSAGE; 45 message.id = id; 46 message.data = data; 47 } 48 49 int type; 50 vec2i mouse_move; 51 int mouse_button, key; 52 53 struct { char alt, ctrl, shift; } key_special; 54 struct { int x1, y1, x2, y2; void *start; } redraw; 55 56 Jwindow *window; // NULL is root 57 vec2i window_position; 58 struct { int id; char *data; } message; 59 }; 60 61 class EventHandler 52 62 { 53 sprite_controller sc; 54 int mhere,ewaiting,last_keystat,last_key; 55 int get_key_flags(); 56 linked_list events; 57 public : 63 public: 64 EventHandler(image *screen, palette *pal); 65 ~EventHandler(); 66 67 void Push(Event *ev) 68 { 69 m_events.add_end(ev); 70 } 71 58 72 JCMouse *mouse; 59 73 sprite *mouse_sprite() { return mouse->mouse_sprite(); } 60 event_handler(image *screen, palette *pal);61 74 int event_waiting(); 62 void get_event(event &ev);75 void Get(Event &ev); 63 76 void add_redraw(int X1, int Y1, int X2, int Y2, void *Start); 64 77 void mouse_status(int &x, int &y, int &button) 65 { if (mouse) 78 { 79 if (mouse) 66 80 { 67 x=mouse->x(); y=mouse->y(); button=mouse->button(); 68 } else x=y=button=0; 81 x = mouse->x(); 82 y = mouse->y(); 83 button = mouse->button(); 84 } else x = y = button = 0; 69 85 } 70 void push_event(event *ev) { events.add_end(ev); }71 86 void flush_screen(); 72 int has_mouse() { return mouse->exsist(); } 73 void set_mouse_shape(image *im, int centerx, int centery) { mouse->set_shape(im,-centerx,-centery); } 74 void set_mouse_position(int mx, int my) { if (mouse) mouse->set_position(mx,my); } 75 ~event_handler(); 76 } ; 87 int has_mouse() { return mouse->exists(); } 88 void set_mouse_shape(image *im, int centerx, int centery) { mouse->set_shape(im, -centerx, -centery); } 89 void set_mouse_position(int mx, int my) { if (mouse) mouse->set_position(mx, my); } 90 91 private: 92 int get_key_flags(); 93 94 linked_list m_events; 95 int mhere, ewaiting, last_keystat, last_key; 96 sprite_controller sc; 97 }; 98 77 99 #endif 78 100 -
abuse/trunk/src/imlib/include.cpp
r555 r643 28 28 tmp_name[j]='_'; 29 29 30 FILE *fp=fopen(filename,"rb"); // see if the file already ex sist30 FILE *fp=fopen(filename,"rb"); // see if the file already exists 31 31 if (fp) 32 32 { -
abuse/trunk/src/imlib/input.cpp
r579 r643 113 113 } 114 114 115 void button_box::handle_event( event &ev, image *screen, InputManager *im)115 void button_box::handle_event(Event &ev, image *screen, InputManager *im) 116 116 { 117 117 switch (ev.type) … … 268 268 } 269 269 270 void text_field::handle_event( event &ev, image *screen, InputManager *im)270 void text_field::handle_event(Event &ev, image *screen, InputManager *im) 271 271 { 272 272 int xx; … … 293 293 draw_text(screen); 294 294 draw_cur(wm->bright_color(),screen); 295 wm-> push_event(new event(id,(char *)this));295 wm->Push(new Event(id,(char *)this)); 296 296 } break; 297 297 default : if (ev.key>=' ' && ev.key<='~') … … 306 306 draw_text(screen); 307 307 draw_cur(wm->bright_color(),screen); 308 wm-> push_event(new event(id,(char *)this));308 wm->Push(new Event(id,(char *)this)); 309 309 } break; 310 310 } … … 366 366 { up=!up; } 367 367 368 void button::handle_event( event &ev, image *screen, InputManager *im)368 void button::handle_event(Event &ev, image *screen, InputManager *im) 369 369 { 370 370 if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON && … … 376 376 draw_first(screen); 377 377 draw(act,screen); 378 wm-> push_event(new event(id,(char *)this));378 wm->Push(new Event(id,(char *)this)); 379 379 } 380 380 } … … 385 385 area(x1,y1,x2,y2); 386 386 if (active!=act && act_id!=-1 && active) 387 wm-> push_event(new event(act_id,NULL));387 wm->Push(new Event(act_id,NULL)); 388 388 389 389 if (pressed) -
abuse/trunk/src/imlib/input.h
r579 r643 30 30 virtual void draw_first(image *screen); 31 31 virtual void draw(int active, image *screen); 32 virtual void handle_event( event &ev, image *screen, InputManager *im);32 virtual void handle_event(Event &ev, image *screen, InputManager *im); 33 33 void change_visual(image *new_visual); 34 34 virtual void remap(Filter *f); … … 53 53 virtual void draw_first(image *screen); 54 54 virtual void draw(int active, image *screen); 55 virtual void handle_event( event &ev, image *screen, InputManager *im);55 virtual void handle_event(Event &ev, image *screen, InputManager *im); 56 56 virtual ~button_box(); 57 57 virtual char *read(); // return pointer to first button which is depressed … … 84 84 virtual void draw_first(image *screen); 85 85 virtual void draw(int active, image *screen); 86 virtual void handle_event( event &ev, image *screen, InputManager *im);86 virtual void handle_event(Event &ev, image *screen, InputManager *im); 87 87 88 88 virtual ~text_field() { free(prompt); free(format); free(data); } … … 104 104 virtual void draw_first(image *screen); 105 105 virtual void draw(int active, image *screen) { ; } 106 virtual void handle_event( event &ev, image *screen, InputManager *im) { ; }106 virtual void handle_event(Event &ev, image *screen, InputManager *im) { ; } 107 107 virtual char *read() { return text; } 108 108 virtual int selectable() { return 0; } -
abuse/trunk/src/imlib/jwindow.cpp
r579 r643 22 22 #include "event.h" 23 23 #include "filter.h" 24 #include "event.h"25 24 #include "jwindow.h" 26 25 … … 73 72 { 74 73 p->hide(); 75 screen->AddDirty(p->x, p->y, p->x + p->l, p->y + p->h);74 m_screen->AddDirty(p->x, p->y, p->x + p->l, p->y + p->h); 76 75 } 77 76 } … … 100 99 k->next = j->next; 101 100 } 102 screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);101 m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h); 103 102 j->hide(); 104 103 } … … 113 112 } 114 113 115 void WindowManager::get_event( event &ev)116 { 117 Jwindow *j;118 eh->get_event(ev); 114 void WindowManager::get_event(Event &ev) 115 { 116 Get(ev); 117 119 118 if (ev.type==EV_KEY) 120 119 key_state[ev.key]=1; … … 124 123 if (state==inputing) 125 124 { 125 Jwindow *j; 126 126 for (ev.window=NULL,j=first; j; j=j->next) 127 127 if (!j->is_hidden() && ev.mouse_move.x>=j->x && ev.mouse_move.y>=j->y && … … 180 180 { 181 181 Jwindow *j=ev.window; 182 /* screen->AddDirty(j->x,j->y,j->x+j->l,j->y+j->h);182 /* m_screen->AddDirty(j->x,j->y,j->x+j->l,j->y+j->h); 183 183 for (p=first; p!=j; p=p->next) 184 184 p->screen->AddDirty(j->x-p->x,j->y-p->y,j->x+j->l-p->x,j->y+j->h-p->y); */ … … 213 213 if (ev.type == EV_REDRAW) 214 214 { 215 for ( j=first; j; j=j->next)215 for (Jwindow *j = first; j; j = j->next) 216 216 j->screen->AddDirty(ev.redraw.x1 - j->x, ev.redraw.y1 - j->y, 217 217 ev.redraw.x2 + 1 - j->x, ev.redraw.y2 + 1 - j->y); 218 screen->AddDirty(ev.redraw.x1, ev.redraw.y1, ev.redraw.x2 + 1, ev.redraw.y2 + 1);218 m_screen->AddDirty(ev.redraw.x1, ev.redraw.y1, ev.redraw.x2 + 1, ev.redraw.y2 + 1); 219 219 flush_screen(); 220 220 ev.type=EV_SPURIOUS; // we took care of this one by ourselves. … … 231 231 { 232 232 Jwindow *p; 233 screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);233 m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h); 234 234 for (p=first; p!=j; p=p->next) 235 235 p->screen->AddDirty(j->x - p->x, j->y - p->y, j->x + j->l - p->x, j->y + j->h - p->y); … … 241 241 void WindowManager::move_window(Jwindow *j, int x, int y) 242 242 { 243 screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);243 m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h); 244 244 for(Jwindow *p = first; p != j; p = p->next) 245 245 p->screen->AddDirty(j->x - p->x, j->y - p->y, … … 250 250 } 251 251 252 WindowManager::WindowManager(image * Screen, palette *Pal, int Hi,252 WindowManager::WindowManager(image *screen, palette *pal, int Hi, 253 253 int Med, int Low, JCFont *Font) 254 : EventHandler(screen, pal) 254 255 { 255 256 wm = this; 256 screen = Screen;257 hi = Hi; low = Low; med = Med; first = NULL; pal = Pal; grab = NULL;257 m_screen = screen; 258 hi = Hi; low = Low; med = Med; first = NULL; m_pal = pal; grab = NULL; 258 259 bk = pal->find_closest(0, 0, 0); 259 260 state = inputing; fnt = Font; wframe_fnt = Font; 260 261 memset(key_state, 0, sizeof(key_state)); 261 eh = new event_handler(screen, pal);262 262 frame_suppress = 0; 263 263 } … … 265 265 WindowManager::~WindowManager() 266 266 { 267 delete eh;268 267 while(first) 269 268 close_window(first); … … 310 309 } 311 310 312 screen->AddDirty(win->x, win->y, win->x + win->l, win->y + win->h);311 m_screen->AddDirty(win->x, win->y, win->x + win->l, win->y + win->h); 313 312 } 314 313 … … 316 315 ifield * fields, char const *name) 317 316 { 318 if(x > screen->Size().x - 4)319 x = screen->Size().x - 25;320 if(y > screen->Size().y - 4)321 y = screen->Size().y - 10;317 if(x > m_screen->Size().x - 4) 318 x = m_screen->Size().x - 25; 319 if(y > m_screen->Size().y - 4) 320 y = m_screen->Size().y - 10; 322 321 323 322 Jwindow * j = new Jwindow (x, y, l, h, fields, name); … … 336 335 if(has_mouse()) 337 336 { 338 mouse_pic = eh->mouse_sprite()->visual;339 mouse_save = eh->mouse_sprite()->save;340 mx = eh->mouse->drawx();341 my = eh->mouse->drawy();342 343 screen->put_part(mouse_save, 0, 0, mx, my,337 mouse_pic = mouse_sprite()->visual; 338 mouse_save = mouse_sprite()->save; 339 mx = mouse->drawx(); 340 my = mouse->drawy(); 341 342 m_screen->put_part(mouse_save, 0, 0, mx, my, 344 343 mx + mouse_pic->Size().x - 1, 345 344 my + mouse_pic->Size().y - 1); 346 mouse_pic->put_image( screen, mx, my, 1);345 mouse_pic->put_image(m_screen, mx, my, 1); 347 346 } 348 347 349 348 for(p = first; p; p = p->next) 350 349 if(!p->is_hidden()) 351 screen->delete_dirty(p->x, p->y, p->x + p->l, p->y + p->h);352 update_dirty( screen);350 m_screen->delete_dirty(p->x, p->y, p->x + p->l, p->y + p->h); 351 update_dirty(m_screen); 353 352 354 353 if(has_mouse()) 355 mouse_save->put_image( screen, mx, my);354 mouse_save->put_image(m_screen, mx, my); 356 355 357 356 for(p = first; p; p = p->next) … … 369 368 } 370 369 371 // screen->delete_dirty(p->x, p->y, p->x+p->l, p->y+p->h);370 // m_screen->delete_dirty(p->x, p->y, p->x+p->l, p->y+p->h); 372 371 for(q = p->next; q; q = q->next) 373 372 if(!q->is_hidden()) … … 598 597 } 599 598 600 void InputManager::handle_event( event &ev, Jwindow *j)599 void InputManager::handle_event(Event &ev, Jwindow *j) 601 600 { 602 601 ifield *i,*in_area=NULL; -
abuse/trunk/src/imlib/jwindow.h
r579 r643 11 11 #ifndef __JWIN__ 12 12 #define __JWIN__ 13 13 14 #include "video.h" 14 15 #include "image.h" 15 16 #include "event.h" 16 17 #include "filter.h" 17 #include "event.h"18 18 #include "fonts.h" 19 19 … … 40 40 41 41 public: 42 InputManager(image * Screen, ifield *First);43 InputManager(Jwindow *owner, ifield * First);44 void handle_event( event &ev, Jwindow *j);42 InputManager(image *screen, ifield *first); 43 InputManager(Jwindow *owner, ifield *first); 44 void handle_event(Event &ev, Jwindow *j); 45 45 ifield *get(int id); 46 46 void redraw(); … … 74 74 virtual void draw_first(image *screen) = 0; 75 75 virtual void draw(int active, image *screen) = 0; 76 virtual void handle_event( event &ev, image *screen, InputManager *im) = 0;76 virtual void handle_event(Event &ev, image *screen, InputManager *im) = 0; 77 77 virtual int selectable() { return 1; } 78 78 virtual void remap(Filter *f) { ; } … … 133 133 }; 134 134 135 class WindowManager 135 class WindowManager : public EventHandler 136 136 { 137 137 friend class Jwindow; … … 142 142 143 143 public: 144 event_handler *eh; 144 WindowManager(image *, palette *, int hi, int med, int low, JCFont *); 145 ~WindowManager(); 146 145 147 Jwindow *first, *grab; 146 image *screen, *mouse_pic, *mouse_save; 147 palette *pal; 148 image *mouse_pic, *mouse_save; 148 149 int hi, med, low, bk; // bright, medium, dark and black colors 149 150 int key_state[512]; … … 152 153 Jwindow *drag_window; 153 154 JCFont *fnt, *wframe_fnt; 154 155 WindowManager(image *, palette *, int hi, int med, int low, JCFont *);156 ~WindowManager();157 155 158 156 Jwindow *new_window(int x, int y, int l, int h, … … 164 162 void resize_window(Jwindow *j, int l, int h); 165 163 void move_window(Jwindow *j, int x, int y); 166 void get_event(event &ev); 167 void push_event(event *ev) { eh->push_event(ev); } 168 int event_waiting() { return eh->event_waiting(); } 164 void get_event(Event &ev); 169 165 void flush_screen(); 170 166 int bright_color() { return hi; } … … 174 170 void set_colors(int Hi, int Med, int Low) { hi=Hi; med=Med; low=Low; } 175 171 JCFont *font() { return fnt; } 176 int has_mouse() { return eh->has_mouse(); }177 void mouse_status(int &x, int &y, int &button) { eh->mouse_status(x,y,button); }178 void set_mouse_shape(image *im, int centerx, int centery)179 { eh->set_mouse_shape(im,centerx,centery); }180 181 void set_mouse_position(int mx, int my)182 { eh->set_mouse_position(mx,my); }183 172 184 173 int key_pressed(int x) { return key_state[x]; } … … 191 180 void release_focus(); 192 181 int window_in_area(int x1, int y1, int x2, int y2); // true if a window lies in this area 182 183 private: 184 palette *m_pal; 185 image *m_screen; 193 186 }; 194 187 -
abuse/trunk/src/imlib/mouse.h
r555 r643 34 34 int last_button() { if (here) return lbut; else return 0; } 35 35 int button() { return but; } 36 int ex sist() { return here; }36 int exists() { return here; } 37 37 sprite *mouse_sprite() { return sp; } 38 38 void set_position(int new_mx, int new_my); -
abuse/trunk/src/imlib/pmenu.cpp
r555 r643 148 148 calc_size(w,h); 149 149 int cx1, cy1, cx2, cy2; 150 screen->GetClip(cx1, cy1, cx2, cy2);150 main_screen->GetClip(cx1, cy1, cx2, cy2); 151 151 // FIXME: is this correct? it looks like it used to be incorrect 152 152 // before the GetClip refactoring... … … 191 191 calc_size(w,h); 192 192 int cx1, cy1, cx2, cy2; 193 screen->GetClip(cx1, cy1, cx2, cy2);193 main_screen->GetClip(cx1, cy1, cx2, cy2); 194 194 if (parent->x+w+x>=cx2) 195 195 x=cx2-1-w-parent->x; … … 311 311 312 312 313 int psub_menu::handle_event(Jwindow *parent, int x, int y, event &ev)313 int psub_menu::handle_event(Jwindow *parent, int x, int y, Event &ev) 314 314 { 315 315 int w,h; 316 316 calc_size(w,h); 317 317 int cx1, cy1, cx2, cy2; 318 screen->GetClip(cx1, cy1, cx2, cy2);318 main_screen->GetClip(cx1, cy1, cx2, cy2); 319 319 320 320 x=win->x; … … 353 353 354 354 int pmenu_item::handle_event(Jwindow *parent, int x, int y, int w, int top, 355 event &ev)355 Event &ev) 356 356 { 357 357 x+=parent->x; … … 364 364 { 365 365 if (ev.type==EV_MOUSE_BUTTON &&n) 366 wm-> push_event(new event(id,(char *)this));366 wm->Push(new Event(id,(char *)this)); 367 367 return 1; 368 368 } … … 393 393 } 394 394 395 int psub_menu::own_event( event &ev)395 int psub_menu::own_event(Event &ev) 396 396 { 397 397 if (win && ev.window==win) return 1; else … … 402 402 } 403 403 404 int pmenu_item::own_event( event &ev)404 int pmenu_item::own_event(Event &ev) 405 405 { 406 406 if (sub) … … 413 413 } 414 414 415 int pmenu::handle_event( event &ev, image *screen)415 int pmenu::handle_event(Event &ev, image *screen) 416 416 { 417 417 if (!active && ev.window!=bar) return 0; … … 436 436 if (r) 437 437 { 438 wm-> push_event(new event(r->id,(char *)r));438 wm->Push(new Event(r->id,(char *)r)); 439 439 return 1; 440 440 } -
abuse/trunk/src/imlib/pmenu.h
r555 r643 33 33 void draw (Jwindow *parent, int x, int y, int w, int top, int active); 34 34 void draw_self (Jwindow *parent, int x, int y, int w, int top, int active); 35 int handle_event(Jwindow *parent, int x, int y, int w, int top, event &ev);36 int own_event( event &ev);35 int handle_event(Jwindow *parent, int x, int y, int w, int top, Event &ev); 36 int own_event(Event &ev); 37 37 ~pmenu_item(); 38 38 } ; … … 52 52 psub_menu(pmenu_item *First, psub_menu *Next) 53 53 { first=First; Next=Next; win=0; active=0; } 54 int handle_event(Jwindow *parent, int x, int y, event &ev);54 int handle_event(Jwindow *parent, int x, int y, Event &ev); 55 55 void draw(Jwindow *parent, int x, int y); 56 56 void hide(Jwindow *parent, int x, int y); 57 int own_event( event &ev);57 int own_event(Event &ev); 58 58 ~psub_menu(); 59 59 } ; … … 72 72 void move(int new_x, int new_y); 73 73 void draw(image *screen, int top_only=0); 74 int handle_event( event &ev, image *screen);74 int handle_event(Event &ev, image *screen); 75 75 76 76 } ; -
abuse/trunk/src/imlib/scroller.cpp
r555 r643 180 180 181 181 182 void scroller::handle_event( event &ev, image *screen, InputManager *inm)182 void scroller::handle_event(Event &ev, image *screen, InputManager *inm) 183 183 { 184 184 int mx=ev.mouse_move.x,my=ev.mouse_move.y; … … 414 414 } 415 415 416 void pick_list::handle_inside_event( event &ev, image *screen, InputManager *inm)416 void pick_list::handle_inside_event(Event &ev, image *screen, InputManager *inm) 417 417 { 418 418 if (ev.type==EV_MOUSE_MOVE && activate_on_mouse_move()) … … 431 431 { 432 432 if (sel==cur_sel) 433 wm-> push_event(new event(id,(char *)this));433 wm->Push(new Event(id,(char *)this)); 434 434 else 435 435 { … … 439 439 } 440 440 } else if (ev.type==EV_KEY && ev.key==JK_ENTER) 441 wm-> push_event(new event(id,(char *)this));441 wm->Push(new Event(id,(char *)this)); 442 442 else if (ev.type==EV_KEY) 443 443 { … … 628 628 629 629 630 void spicker::handle_inside_event( event &ev, image *screen, InputManager *inm)630 void spicker::handle_inside_event(Event &ev, image *screen, InputManager *inm) 631 631 { 632 632 switch (ev.type) -
abuse/trunk/src/imlib/scroller.h
r555 r643 42 42 virtual void draw_first(image *screen); 43 43 virtual void draw(int active, image *screen); 44 virtual void handle_event( event &ev, image *screen, InputManager *im);44 virtual void handle_event(Event &ev, image *screen, InputManager *im); 45 45 virtual char *read() { return (char *)&sx; } 46 46 47 47 virtual int activate_on_mouse_move() { return 1; } 48 virtual void handle_inside_event( event &ev, image *screen, InputManager *inm) { ; }48 virtual void handle_inside_event(Event &ev, image *screen, InputManager *inm) { ; } 49 49 virtual void scroll_event(int newx, image *screen); 50 50 virtual void handle_up(image *screen, InputManager *inm); … … 70 70 int first_selected(); 71 71 virtual void scroll_event(int newx, image *screen); 72 virtual void handle_inside_event( event &ev, image *screen, InputManager *inm);72 virtual void handle_inside_event(Event &ev, image *screen, InputManager *inm); 73 73 74 74 // you should define \/ … … 105 105 pick_list(int X, int Y, int ID, int height, 106 106 char **List, int num_entries, int start_yoffset, ifield *Next, image *texture=NULL); 107 virtual void handle_inside_event( event &ev, image *screen, InputManager *inm);107 virtual void handle_inside_event(Event &ev, image *screen, InputManager *inm); 108 108 virtual void scroll_event(int newx, image *screen); 109 109 virtual char *read() { return (char *)this; } -
abuse/trunk/src/imlib/tools.h
r579 r643 39 39 virtual int item_height() { return ih; } 40 40 virtual void note_new_current(image *screen, InputManager *inm, int x) 41 { wm-> push_event(new event(ids[x],NULL)); }41 { wm->Push(new Event(ids[x],NULL)); } 42 42 43 43 void remap(palette *pal, image *screen); -
abuse/trunk/src/imlib/video.h
r555 r643 22 22 #include "image.h" 23 23 24 25 24 extern int xres,yres; 26 25 extern int xoff,yoff; 27 extern image * screen;26 extern image *main_screen; 28 27 29 28 void set_mode(int mode, int argc=0, char **argv=NULL); … … 40 39 41 40 #endif 41 -
abuse/trunk/src/innet.cpp
r629 r643 607 607 if (wm->event_waiting()) 608 608 { 609 event ev;609 Event ev; 610 610 do 611 611 { … … 707 707 if (wm->event_waiting()) 708 708 { 709 event ev;709 Event ev; 710 710 do 711 711 { -
abuse/trunk/src/level.cpp
r635 r643 771 771 char name[100]; 772 772 sprintf(name,"shot%04d.pcx",screen_shot_on++); 773 write_PCX( screen,pal,name);773 write_PCX(main_screen,pal,name); 774 774 } 775 775 } … … 802 802 the_game->game_to_mouse(a->x,a->y,v,sx1,sy1); 803 803 the_game->game_to_mouse(a->x+a->w,a->y+a->h,v,sx2,sy2); 804 screen->rectangle(sx1,sy1,sx2,sy2,c1);805 screen->bar(sx1-1,sy1-1,sx1+1,sy1+1,c2);806 screen->bar(sx2-1,sy2-1,sx2+1,sy2+1,c2);804 main_screen->rectangle(sx1,sy1,sx2,sy2,c1); 805 main_screen->bar(sx1-1,sy1-1,sx1+1,sy1+1,c2); 806 main_screen->bar(sx2-1,sy2-1,sx2+1,sy2+1,c2); 807 807 } 808 808 } … … 1079 1079 fp->read(old_name,fp->read_uint8()); 1080 1080 int new_type=o_remap[i]; 1081 if (new_type<total_objects) // make sure old object still ex sist1081 if (new_type<total_objects) // make sure old object still exists 1082 1082 { 1083 1083 int k=0; … … 1117 1117 fp->read(old_name,fp->read_uint8()); 1118 1118 int new_type=o_remap[i]; 1119 if (new_type!=0xffff) // make sure old object still ex sist1119 if (new_type!=0xffff) // make sure old object still exists 1120 1120 { 1121 1121 int k=0; … … 1370 1370 stat_man->update(10); 1371 1371 1372 /***************** Check map for non ex sistant tiles **************************/1372 /***************** Check map for non existsant tiles **************************/ 1373 1373 int32_t i,w; 1374 1374 uint16_t *m; … … 1792 1792 if (fp->read_uint8()==RC_32) 1793 1793 { 1794 int32_t m=fp->read_uint32(); // read how many weapons ex sisted when last saved1794 int32_t m=fp->read_uint32(); // read how many weapons existsed when last saved 1795 1795 int i; 1796 1796 for (v=player_list; v; v=v->next) … … 2323 2323 { 2324 2324 write_player_info( fp, objs ); 2325 write_thumb_nail( fp, screen );2325 write_thumb_nail( fp,main_screen ); 2326 2326 } 2327 2327 -
abuse/trunk/src/light.cpp
r579 r643 794 794 light_patch *f=first; 795 795 796 screen->Lock();797 798 int scr_w= screen->Size().x;799 uint8_t *screen_line= screen->scan_line(cy1)+cx1;796 main_screen->Lock(); 797 798 int scr_w=main_screen->Size().x; 799 uint8_t *screen_line=main_screen->scan_line(cy1)+cx1; 800 800 801 801 for (int y = cy1; y < cy2; ) … … 887 887 screen_line-=prefix; 888 888 } 889 screen->Unlock();889 main_screen->Unlock(); 890 890 891 891 while (first) -
abuse/trunk/src/lisp/lisp.cpp
r638 r643 764 764 765 765 766 LSymbol *make_find_symbol(char const *name) // find a symbol, if it doesn't ex sistit is created766 LSymbol *make_find_symbol(char const *name) // find a symbol, if it doesn't exists it is created 767 767 { 768 768 LSymbol *s=find_symbol(name); -
abuse/trunk/src/loadgame.cpp
r619 r643 112 112 113 113 Jwindow *l_win=create_num_window(mx,MAX_SAVE_GAMES,MAX_SAVE_LINES,NULL); 114 event ev;114 Event ev; 115 115 int got_level=0; 116 116 int quit=0; … … 238 238 first->put_image(preview->screen,preview->x1(),preview->y1()); 239 239 240 event ev;240 Event ev; 241 241 int got_level=0; 242 242 int quit=0; -
abuse/trunk/src/menu.cpp
r635 r643 52 52 int x,y; 53 53 int cx1, cy1, cx2, cy2; 54 screen->GetClip(cx1, cy1, cx2, cy2);54 main_screen->GetClip(cx1, cy1, cx2, cy2); 55 55 if (x1<cx1) x1=cx1; 56 56 if (y1<cy1) y1=cy1; … … 61 61 percent=256-percent; 62 62 63 screen->Lock();63 main_screen->Lock(); 64 64 for (y=y1; y<=y2; y++) 65 65 { 66 uint8_t *sl= screen->scan_line(y)+x1;66 uint8_t *sl=main_screen->scan_line(y)+x1; 67 67 for (x=x1; x<=x2; x++,sl++) 68 68 { … … 74 74 } 75 75 } 76 screen->AddDirty(x1, y1, x2 + 1, y2 + 1);77 screen->Unlock();76 main_screen->AddDirty(x1, y1, x2 + 1, y2 + 1); 77 main_screen->Unlock(); 78 78 } 79 79 … … 82 82 int x,y; 83 83 int cx1, cy1, cx2, cy2; 84 screen->GetClip(cx1, cy1, cx2, cy2);84 main_screen->GetClip(cx1, cy1, cx2, cy2); 85 85 if (x1<cx1) x1=cx1; 86 86 if (y1<cy1) y1=cy1; … … 89 89 if (x2<x1 || y2<y1) return ; 90 90 91 screen->Lock();91 main_screen->Lock(); 92 92 for (y=y1; y<=y2; y++) 93 93 { 94 uint8_t *sl= screen->scan_line(y)+x1;94 uint8_t *sl=main_screen->scan_line(y)+x1; 95 95 for (x=x1; x<=x2; x++,sl++) 96 96 { … … 102 102 } 103 103 } 104 screen->AddDirty(x1, y1, x2 + 1, y2 + 1);105 screen->Unlock();104 main_screen->AddDirty(x1, y1, x2 + 1, y2 + 1); 105 main_screen->Unlock(); 106 106 } 107 107 108 108 void dark_widget(int x1, int y1, int x2, int y2, int br, int dr, int amount) 109 109 { 110 screen->AddDirty(x1, y1, x2 + 1, y2 + 1);111 screen->line(x1,y1,x1,y2,br);112 screen->line(x1+1,y1,x2,y1,br);113 screen->line(x2,y1+1,x2,y2,dr);114 screen->line(x1+1,y2,x2,y2,dr);110 main_screen->AddDirty(x1, y1, x2 + 1, y2 + 1); 111 main_screen->line(x1,y1,x1,y2,br); 112 main_screen->line(x1+1,y1,x2,y1,br); 113 main_screen->line(x2,y1+1,x2,y2,dr); 114 main_screen->line(x1+1,y2,x2,y2,dr); 115 115 darken_area(x1+1,y1+1,x2-1,y2-1,amount); 116 116 } … … 154 154 155 155 int mw=(font->width())*maxw+20; 156 int mx= screen->Size().x/2-mw/2,157 my= screen->Size().y/2-mh/2;158 159 160 screen->AddDirty(mx, my, mx + mw, my + mh);156 int mx=main_screen->Size().x/2-mw/2, 157 my=main_screen->Size().y/2-mh/2; 158 159 160 main_screen->AddDirty(mx, my, mx + mw, my + mh); 161 161 162 162 if (title) 163 163 { 164 164 int tl=strlen(title)*font->width(); 165 int tx= screen->Size().x/2-tl/2;165 int tx=main_screen->Size().x/2-tl/2; 166 166 dark_widget(tx-2,my-font->height()-4,tx+tl+2,my-2,wm->medium_color(),wm->dark_color(),180); 167 font->put_string( screen,tx+1,my-font->height()-2,title,wm->bright_color());167 font->put_string(main_screen,tx+1,my-font->height()-2,title,wm->bright_color()); 168 168 } 169 169 … … 175 175 { 176 176 char *ms=men_str(CAR(c)); 177 font->put_string( screen,mx+10+1,y+1,ms,wm->black());178 font->put_string( screen,mx+10,y,ms,wm->bright_color());177 font->put_string(main_screen,mx+10+1,y+1,ms,wm->black()); 178 font->put_string(main_screen,mx+10,y,ms,wm->bright_color()); 179 179 y+=font->height()+1; 180 180 } 181 181 182 182 wm->flush_screen(); 183 event ev;183 Event ev; 184 184 int choice=0,done=0; 185 185 int bh=font->height()+3; … … 240 240 int by2=by1+bh-1; 241 241 242 screen->put_part(save,0,0,mx+1,by1,mx+mw-2,by2);242 main_screen->put_part(save,0,0,mx+1,by1,mx+mw-2,by2); 243 243 tint_area(mx+1,by1,mx+mw-2,by2,63,63,63,color); 244 244 245 245 char *cur=men_str(nth(choice,args)); 246 font->put_string( screen,mx+10+1,by1+3,cur,wm->black());247 font->put_string( screen,mx+10,by1+2,cur,wm->bright_color());248 screen->rectangle(mx+1,by1,mx+mw-2,by2,wm->bright_color());246 font->put_string(main_screen,mx+10+1,by1+3,cur,wm->black()); 247 font->put_string(main_screen,mx+10,by1+2,cur,wm->bright_color()); 248 main_screen->rectangle(mx+1,by1,mx+mw-2,by2,wm->bright_color()); 249 249 250 250 color+=cdir; … … 256 256 } 257 257 wm->flush_screen(); 258 save->put_image( screen,mx+1,by1);258 save->put_image(main_screen,mx+1,by1); 259 259 } else { Timer tmp; tmp.WaitMs(10); } 260 260 … … 286 286 while(volume_window) 287 287 { 288 event ev;288 Event ev; 289 289 290 290 do … … 410 410 fade_in(cache.img(im),16); 411 411 412 event ev;412 Event ev; 413 413 do 414 414 { wm->flush_screen(); … … 425 425 426 426 427 void menu_handler( event &ev, InputManager *inm)427 void menu_handler(Event &ev, InputManager *inm) 428 428 { 429 429 switch (ev.type) … … 516 516 { 517 517 show_sell(1); 518 screen->clear();518 main_screen->clear(); 519 519 if (title_screen>=0) 520 520 { 521 521 image *tit=cache.img(title_screen); 522 tit->put_image( screen,screen->Size().x/2-tit->Size().x/2,523 screen->Size().y/2-tit->Size().y/2);522 tit->put_image(main_screen,main_screen->Size().x/2-tit->Size().x/2, 523 main_screen->Size().y/2-tit->Size().y/2); 524 524 } 525 525 inm->redraw(); … … 661 661 list=make_default_buttons(xres-33,y,list); 662 662 663 InputManager *inm=new InputManager( screen,list);663 InputManager *inm=new InputManager(main_screen,list); 664 664 inm->allow_no_selections(); 665 665 inm->clear_current(); 666 666 667 screen->AddDirty(0, 0, 320, 200);668 669 event ev;667 main_screen->AddDirty(0, 0, 320, 200); 668 669 Event ev; 670 670 671 671 int stop_menu=0; … … 684 684 inm->handle_event(ev,NULL); 685 685 if (ev.type==EV_KEY && ev.key==JK_ESC) 686 wm-> push_event(new event(ID_QUIT,NULL));686 wm->Push(new Event(ID_QUIT,NULL)); 687 687 688 688 menu_handler(ev,inm); -
abuse/trunk/src/morpher.cpp
r642 r643 26 26 int32_t rx,ry; 27 27 the_game->game_to_mouse(who->x-(cx>>16),who->y-(cy>>16),v,rx,ry); 28 mor->show( screen,rx,ry,color_table,pal,1000);28 mor->show(main_screen,rx,ry,color_table,pal,1000); 29 29 cx+=dcx; 30 30 cy+=dcy; -
abuse/trunk/src/net/engine.cpp
r555 r643 155 155 156 156 157 unlink(DIN_NAME); // remove any previous files if they ex sists157 unlink(DIN_NAME); // remove any previous files if they existss 158 158 unlink(DOUT_NAME); 159 159 -
abuse/trunk/src/net/gserver.cpp
r555 r643 63 63 int last_count=0; 64 64 Jwindow *stat=NULL; 65 event ev;65 Event ev; 66 66 int abort=0; 67 67 while (!abort && total_players()<main_net_cfg->min_players) -
abuse/trunk/src/net/undrv.cpp
r555 r643 91 91 unlink(DLOCK_NAME); 92 92 } 93 unlink(DIN_NAME); // remove any previous files if they ex sists93 unlink(DIN_NAME); // remove any previous files if they existss 94 94 unlink(DOUT_NAME); 95 95 return 1; -
abuse/trunk/src/netcfg.cpp
r629 r643 66 66 Jwindow *j=wm->new_window(-1,0,-1,-1,new info_field(0, 0, 0, msg, 67 67 new button(0, 30,CFG_ERR_OK,symbol_str("ok_button"),NULL)),symbol_str("input_error")); 68 event ev;68 Event ev; 69 69 do 70 70 { … … 188 188 NULL)))),symbol_str("Networking")); 189 189 190 event ev;190 Event ev; 191 191 int done=0; 192 192 do … … 270 270 void net_configuration::error(char const *message) 271 271 { 272 image *screen_backup =screen->copy();272 image *screen_backup = main_screen->copy(); 273 273 274 274 image *ns=cache.img(cache.reg("art/frame.spe","net_screen",SPEC_IMAGE,1)); 275 275 int ns_w=ns->Size().x,ns_h=ns->Size().y; 276 276 int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2; 277 ns->put_image( screen,x,y);277 ns->put_image(main_screen,x,y); 278 278 JCFont *fnt=wm->font(); 279 279 280 280 uint8_t *remap=white_light+30*256; 281 281 282 uint8_t *sl =screen->scan_line(0);283 int xx =screen->Size().x*screen->Size().y;282 uint8_t *sl = main_screen->scan_line(0); 283 int xx = main_screen->Size().x * main_screen->Size().y; 284 284 for (; xx; xx--,sl++) *sl=remap[*sl]; 285 285 … … 287 287 fy=y+ns_h/2-fnt->height(); 288 288 289 fnt->put_string( screen,fx+1,fy+1,message,wm->black());290 fnt->put_string( screen,fx,fy,message,wm->bright_color());289 fnt->put_string(main_screen,fx+1,fy+1,message,wm->black()); 290 fnt->put_string(main_screen,fx,fy,message,wm->bright_color()); 291 291 292 292 … … 299 299 button *sb=new button(bx,by,NET_SERVER,ok,NULL); 300 300 301 InputManager inm( screen,sb);301 InputManager inm(main_screen, sb); 302 302 inm.allow_no_selections(); 303 303 inm.clear_current(); 304 304 305 305 int done=0; 306 event ev;306 Event ev; 307 307 do 308 308 { … … 315 315 } 316 316 317 screen_backup->put_image( screen,0,0);317 screen_backup->put_image(main_screen, 0, 0); 318 318 wm->flush_screen(); 319 319 delete screen_backup; … … 340 340 int ns_w=ns->Size().x,ns_h=ns->Size().y; 341 341 int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2; 342 ns->put_image( screen,x,y);342 ns->put_image(main_screen,x,y); 343 343 JCFont *fnt=wm->font(); 344 344 image *ok_image=cache.img(cache.reg("art/frame.spe","dev_ok",SPEC_IMAGE,1))->copy(), … … 419 419 420 420 { 421 InputManager inm( screen,list);421 InputManager inm(main_screen, list); 422 422 inm.allow_no_selections(); 423 423 inm.clear_current(); 424 424 425 425 int done=0; 426 event ev;426 Event ev; 427 427 do 428 428 { … … 455 455 int ret=0; 456 456 #if !defined __CELLOS_LV2__ 457 screen->clear();457 main_screen->clear(); 458 458 459 459 image *ns=cache.img(cache.reg("art/frame.spe","net_screen",SPEC_IMAGE,1)); 460 460 int ns_w=ns->Size().x,ns_h=ns->Size().y; 461 461 int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2; 462 ns->put_image( screen,x,y);462 ns->put_image(main_screen, x, y); 463 463 char const *nw_s = symbol_str("Networking"); 464 464 JCFont *fnt=wm->font(); 465 465 466 466 467 wm->font()->put_string( screen,x+ns_w/2-strlen(nw_s)*fnt->width()/2,y+21/2-fnt->height()/2,467 wm->font()->put_string(main_screen,x+ns_w/2-strlen(nw_s)*fnt->width()/2,y+21/2-fnt->height()/2, 468 468 nw_s,wm->medium_color()); 469 469 { … … 475 475 sb=new button(x+40,y+ns_h-9-fnt->height(),NET_SINGLE,symbol_str("single_play"),sb); 476 476 477 InputManager inm( screen,sb);477 InputManager inm(main_screen,sb); 478 478 479 479 inm.allow_no_selections(); … … 481 481 482 482 483 event ev;483 Event ev; 484 484 int done=0; 485 485 int button_y=25,total_games=0; -
abuse/trunk/src/objects.cpp
r642 r643 110 110 if (t->tiv<=number || !t->vars[number]) 111 111 { 112 lbreak("access : variable does not ex sistfor this class\n");112 lbreak("access : variable does not exists for this class\n"); 113 113 return 0; 114 114 } … … 393 393 394 394 for (i=sy1; i<=sy2; i++) 395 p->PutScanLine( screen,vec2i(sx,i),0);395 p->PutScanLine(main_screen,vec2i(sx,i),0); 396 396 } 397 397 } … … 669 669 { 670 670 TransImage *cpict=picture(); 671 cpict->PutFade( screen,671 cpict->PutFade(main_screen, 672 672 vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd, 673 673 y-cpict->Size().y+1-current_vyadd), … … 681 681 TransImage *cpict=picture(); 682 682 if (fade_count()) 683 cpict->PutFadeTint( screen,683 cpict->PutFadeTint(main_screen, 684 684 vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd, 685 685 y-cpict->Size().y+1-current_vyadd), … … 690 690 691 691 else 692 cpict->PutRemap( screen,692 cpict->PutRemap(main_screen, 693 693 vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd, 694 694 y-cpict->Size().y+1-current_vyadd), … … 701 701 TransImage *cpict=picture(); 702 702 if (fade_count()) 703 cpict->PutFadeTint( screen,703 cpict->PutFadeTint(main_screen, 704 704 vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd, 705 705 y-cpict->Size().y+1-current_vyadd), … … 710 710 711 711 else 712 cpict->PutDoubleRemap( screen,712 cpict->PutDoubleRemap(main_screen, 713 713 vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd, 714 714 y-cpict->Size().y+1-current_vyadd), … … 722 722 { 723 723 TransImage *cpict=picture(); 724 cpict->PutPredator( screen,724 cpict->PutPredator(main_screen, 725 725 vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd, 726 726 y-cpict->Size().y+1-current_vyadd)); … … 745 745 { 746 746 TransImage *cpict=picture(); 747 cpict->PutImage( screen,747 cpict->PutImage(main_screen, 748 748 vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd, 749 749 y-cpict->Size().y+1-current_vyadd)); -
abuse/trunk/src/particle.cpp
r635 r643 165 165 for (part_animation *p=first_anim; p; p=p->next) 166 166 { 167 cache.part(p->seq->frames[p->frame])->draw( screen,p->x-v->xoff()+v->cx1,p->y-v->yoff()+v->cy1,p->dir);167 cache.part(p->seq->frames[p->frame])->draw(main_screen,p->x-v->xoff()+v->cx1,p->y-v->yoff()+v->cy1,p->dir); 168 168 } 169 169 } … … 210 210 { 211 211 int cx1, cy1, cx2, cy2; 212 screen->GetClip(cx1, cy1, cx2, cy2);212 main_screen->GetClip(cx1, cy1, cx2, cy2); 213 213 214 214 int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1; … … 219 219 s = ( 15 - s ); 220 220 221 screen->Lock();221 main_screen->Lock(); 222 222 while( t-- ) 223 223 { … … 226 226 if( !( x < cx1 || y < cy1 || x >= cx2 || y >= cy2 ) ) 227 227 { 228 *( screen->scan_line( y ) + x ) = c;228 *(main_screen->scan_line( y ) + x ) = c; 229 229 } 230 230 xo += dx; 231 231 yo += dy; 232 232 } 233 screen->Unlock();233 main_screen->Unlock(); 234 234 } 235 235 … … 239 239 { 240 240 int cx1, cy1, cx2, cy2; 241 screen->GetClip(cx1, cy1, cx2, cy2);241 main_screen->GetClip(cx1, cy1, cx2, cy2); 242 242 243 243 int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1; … … 248 248 s = ( 15 - s ); 249 249 250 screen->Lock();251 252 int w = screen->Size().x;250 main_screen->Lock(); 251 252 int w = main_screen->Size().x; 253 253 uint8_t *addr; 254 254 … … 261 261 if( !( x <= cx1 || y <= cy1 || x >= cx2 - 1 || y >= cy2 - 1) ) 262 262 { 263 addr = screen->scan_line( y ) + x;263 addr = main_screen->scan_line( y ) + x; 264 264 *addr = c1; 265 265 *(addr + w) = c2; … … 272 272 } 273 273 274 screen->Unlock();275 } 276 274 main_screen->Unlock(); 275 } 276 -
abuse/trunk/src/profile.cpp
r555 r643 44 44 } 45 45 46 int profile_handle_event( event &ev)46 int profile_handle_event(Event &ev) 47 47 { 48 48 if (ev.type==EV_CLOSE_WINDOW && ev.window==prof_win) -
abuse/trunk/src/profile.h
r555 r643 20 20 void profile_update(); 21 21 void profile_toggle(); 22 int profile_handle_event( event &ev);22 int profile_handle_event(Event &ev); 23 23 int profiling(); 24 24 -
abuse/trunk/src/sdlport/event.cpp
r577 r643 36 36 #include "game.h" 37 37 38 extern int get_key_binding( char const *dir, int i);38 extern int get_key_binding(char const *dir, int i); 39 39 extern int mouse_xscale, mouse_yscale; 40 40 short mouse_buttons[5] = { 0, 0, 0, 0, 0 }; 41 41 42 42 // Pre-declarations 43 void handle_mouse( event &ev);43 void handle_mouse(Event &ev); 44 44 45 45 // 46 46 // Constructor 47 47 // 48 event_handler::event_handler( image *screen, palette *pal)49 { 50 CHECK( screen && pal);51 mouse = new JCMouse( screen, pal);52 mhere = mouse->ex sist();48 EventHandler::EventHandler(image *screen, palette *pal) 49 { 50 CHECK(screen && pal); 51 mouse = new JCMouse(screen, pal); 52 mhere = mouse->exists(); 53 53 last_keystat = get_key_flags(); 54 54 ewaiting = 0; 55 55 56 56 // Ignore activate events 57 SDL_EventState( SDL_ACTIVEEVENT, SDL_IGNORE ); 58 } 59 60 // 61 // Destructor 62 // 63 event_handler::~event_handler() 64 { 65 delete mouse; 66 } 67 68 // 69 // flush_screen() 70 // Redraw the screen 71 // 72 void event_handler::flush_screen() 73 { 74 update_dirty( screen ); 57 SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE); 75 58 } 76 59 … … 79 62 // Return the flag for the key modifiers 80 63 // 81 int event_handler::get_key_flags()64 int EventHandler::get_key_flags() 82 65 { 83 66 SDLMod key_flag; … … 85 68 key_flag = SDL_GetModState(); 86 69 87 return ( ( key_flag & KMOD_SHIFT ) != 0) << 3 |88 ( ( key_flag & KMOD_CTRL ) != 0) << 2 |89 ( ( key_flag & KMOD_ALT ) != 0) << 1;70 return ((key_flag & KMOD_SHIFT) != 0) << 3 | 71 ((key_flag & KMOD_CTRL) != 0) << 2 | 72 ((key_flag & KMOD_ALT) != 0) << 1; 90 73 } 91 74 … … 94 77 // Are there any events in the queue? 95 78 // 96 int event_handler::event_waiting()97 { 98 if( ewaiting)79 int EventHandler::event_waiting() 80 { 81 if(ewaiting) 99 82 { 100 83 return 1; 101 84 } 102 if( SDL_PollEvent( NULL ))85 if(SDL_PollEvent(NULL)) 103 86 { 104 87 ewaiting = 1; 105 88 } 106 89 return ewaiting; 107 }108 109 //110 // add_redraw()111 // Add a redraw rectangle.112 //113 void event_handler::add_redraw( int X1, int Y1, int X2, int Y2, void *Start )114 {115 event *ev;116 ev = new event;117 ev->type = EV_REDRAW;118 ev->redraw.x1 = X1;119 ev->redraw.x2 = X2;120 ev->redraw.y1 = Y1;121 ev->redraw.y2 = Y2;122 ev->redraw.start = Start;123 events.add_end(ev);124 90 } 125 91 … … 128 94 // Get and handle waiting events 129 95 // 130 void event_handler::get_event( event &ev)131 { 132 event *ep;133 while( !ewaiting)96 void EventHandler::Get(Event &ev) 97 { 98 Event *ep; 99 while(!ewaiting) 134 100 { 135 101 event_waiting(); … … 142 108 } 143 109 144 ep = ( event *)events.first();145 if( ep)110 ep = (Event *)m_events.first(); 111 if(ep) 146 112 { 147 113 ev = *ep; 148 events.unlink(ep);114 m_events.unlink(ep); 149 115 delete ep; 150 ewaiting = events.first() != NULL;116 ewaiting = m_events.first() != NULL; 151 117 } 152 118 else … … 159 125 160 126 // Gather events 161 SDL_Event event;162 if( SDL_PollEvent( &event ))127 SDL_Event Event; 128 if(SDL_PollEvent(&Event)) 163 129 { 164 130 // always sort the mouse out 165 handle_mouse( ev);166 mouse->update( ev.mouse_move.x, ev.mouse_move.y, ev.mouse_button);167 168 switch( event.type)131 handle_mouse(ev); 132 mouse->update(ev.mouse_move.x, ev.mouse_move.y, ev.mouse_button); 133 134 switch(Event.type) 169 135 { 170 136 case SDL_QUIT: … … 175 141 case SDL_MOUSEBUTTONUP: 176 142 { 177 switch( event.button.button)143 switch(Event.button.button) 178 144 { 179 145 case 4: // Mouse wheel goes up... 180 146 { 181 ev.key = get_key_binding( "b4", 0);147 ev.key = get_key_binding("b4", 0); 182 148 ev.type = EV_KEYRELEASE; 183 149 break; … … 185 151 case 5: // Mouse wheel goes down... 186 152 { 187 ev.key = get_key_binding( "b3", 0);153 ev.key = get_key_binding("b3", 0); 188 154 ev.type = EV_KEYRELEASE; 189 155 break; … … 194 160 case SDL_MOUSEBUTTONDOWN: 195 161 { 196 switch( event.button.button)162 switch(Event.button.button) 197 163 { 198 164 case 4: // Mouse wheel goes up... 199 165 { 200 ev.key = get_key_binding( "b4", 0);166 ev.key = get_key_binding("b4", 0); 201 167 ev.type = EV_KEY; 202 168 break; … … 204 170 case 5: // Mouse wheel goes down... 205 171 { 206 ev.key = get_key_binding( "b3", 0);172 ev.key = get_key_binding("b3", 0); 207 173 ev.type = EV_KEY; 208 174 break; … … 216 182 // Default to EV_SPURIOUS 217 183 ev.key = EV_SPURIOUS; 218 if( event.type == SDL_KEYDOWN)184 if(Event.type == SDL_KEYDOWN) 219 185 { 220 186 ev.type = EV_KEY; … … 224 190 ev.type = EV_KEYRELEASE; 225 191 } 226 switch( event.key.keysym.sym)192 switch(Event.key.keysym.sym) 227 193 { 228 194 case SDLK_DOWN: ev.key = JK_DOWN; break; … … 266 232 { 267 233 // Only handle key down 268 if( ev.type == EV_KEY)234 if(ev.type == EV_KEY) 269 235 { 270 236 // Toggle fullscreen 271 SDL_WM_ToggleFullScreen( SDL_GetVideoSurface());237 SDL_WM_ToggleFullScreen(SDL_GetVideoSurface()); 272 238 } 273 239 ev.key = EV_SPURIOUS; … … 277 243 { 278 244 // Only handle key down 279 if( ev.type == EV_KEY)245 if(ev.type == EV_KEY) 280 246 { 281 247 // Toggle grab mouse 282 if( SDL_WM_GrabInput( SDL_GRAB_QUERY ) == SDL_GRAB_ON)283 { 284 the_game->show_help( "Grab Mouse: OFF\n");285 SDL_WM_GrabInput( SDL_GRAB_OFF);248 if(SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON) 249 { 250 the_game->show_help("Grab Mouse: OFF\n"); 251 SDL_WM_GrabInput(SDL_GRAB_OFF); 286 252 } 287 253 else 288 254 { 289 the_game->show_help( "Grab Mouse: ON\n");290 SDL_WM_GrabInput( SDL_GRAB_ON);255 the_game->show_help("Grab Mouse: ON\n"); 256 SDL_WM_GrabInput(SDL_GRAB_ON); 291 257 } 292 258 } … … 297 263 { 298 264 // Only handle key down 299 if( ev.type == EV_KEY)265 if(ev.type == EV_KEY) 300 266 { 301 267 // Grab a screenshot 302 SDL_SaveBMP( SDL_GetVideoSurface(), "screenshot.bmp");303 the_game->show_help( "Screenshot saved to: screenshot.bmp.\n");268 SDL_SaveBMP(SDL_GetVideoSurface(), "screenshot.bmp"); 269 the_game->show_help("Screenshot saved to: screenshot.bmp.\n"); 304 270 } 305 271 ev.key = EV_SPURIOUS; … … 308 274 default: 309 275 { 310 ev.key = (int) event.key.keysym.sym;276 ev.key = (int)Event.key.keysym.sym; 311 277 // Need to handle the case of shift being pressed 312 278 // There has to be a better way 313 if( (event.key.keysym.mod & KMOD_SHIFT) != 0)279 if((Event.key.keysym.mod & KMOD_SHIFT) != 0) 314 280 { 315 if( event.key.keysym.sym >= SDLK_a &&316 event.key.keysym.sym <= SDLK_z)281 if(Event.key.keysym.sym >= SDLK_a && 282 Event.key.keysym.sym <= SDLK_z) 317 283 { 318 284 ev.key -= 32; 319 285 } 320 else if( event.key.keysym.sym >= SDLK_1 &&321 event.key.keysym.sym <= SDLK_5)286 else if(Event.key.keysym.sym >= SDLK_1 && 287 Event.key.keysym.sym <= SDLK_5) 322 288 { 323 289 ev.key -= 16; … … 325 291 else 326 292 { 327 switch( event.key.keysym.sym)293 switch(Event.key.keysym.sym) 328 294 { 329 295 case SDLK_6: … … 371 337 // able to detect that. 372 338 // 373 void handle_mouse( event &ev)339 void handle_mouse(Event &ev) 374 340 { 375 341 Uint8 buttons; … … 377 343 378 344 // always sort the mouse out 379 buttons = SDL_GetMouseState( &x, &y ); 380 x = (x << 16) / mouse_xscale; 381 y = (y << 16) / mouse_yscale; 382 if( x > screen->Size().x - 1 ) 383 { 384 x = screen->Size().x - 1; 385 } 386 if( y > screen->Size().y - 1 ) 387 { 388 y = screen->Size().y - 1; 389 } 345 buttons = SDL_GetMouseState(&x, &y); 346 x = Min((x << 16) / mouse_xscale, main_screen->Size().x - 1); 347 y = Min((y << 16) / mouse_yscale, main_screen->Size().y - 1); 390 348 ev.mouse_move.x = x; 391 349 ev.mouse_move.y = y; … … 393 351 394 352 // Left button 395 if( (buttons & SDL_BUTTON(1)) && !mouse_buttons[1])353 if((buttons & SDL_BUTTON(1)) && !mouse_buttons[1]) 396 354 { 397 355 ev.type = EV_MOUSE_BUTTON; … … 399 357 ev.mouse_button |= LEFT_BUTTON; 400 358 } 401 else if( !(buttons & SDL_BUTTON(1)) && mouse_buttons[1])359 else if(!(buttons & SDL_BUTTON(1)) && mouse_buttons[1]) 402 360 { 403 361 ev.type = EV_MOUSE_BUTTON; 404 362 mouse_buttons[1] = !mouse_buttons[1]; 405 ev.mouse_button &= ( 0xff - LEFT_BUTTON);363 ev.mouse_button &= (0xff - LEFT_BUTTON); 406 364 } 407 365 408 366 // Middle button 409 if( (buttons & SDL_BUTTON(2)) && !mouse_buttons[2])367 if((buttons & SDL_BUTTON(2)) && !mouse_buttons[2]) 410 368 { 411 369 ev.type = EV_MOUSE_BUTTON; … … 414 372 ev.mouse_button |= RIGHT_BUTTON; 415 373 } 416 else if( !(buttons & SDL_BUTTON(2)) && mouse_buttons[2])374 else if(!(buttons & SDL_BUTTON(2)) && mouse_buttons[2]) 417 375 { 418 376 ev.type = EV_MOUSE_BUTTON; 419 377 mouse_buttons[2] = !mouse_buttons[2]; 420 ev.mouse_button &= ( 0xff - LEFT_BUTTON);421 ev.mouse_button &= ( 0xff - RIGHT_BUTTON);378 ev.mouse_button &= (0xff - LEFT_BUTTON); 379 ev.mouse_button &= (0xff - RIGHT_BUTTON); 422 380 } 423 381 424 382 // Right button 425 if( (buttons & SDL_BUTTON(3)) && !mouse_buttons[3])383 if((buttons & SDL_BUTTON(3)) && !mouse_buttons[3]) 426 384 { 427 385 ev.type = EV_MOUSE_BUTTON; … … 429 387 ev.mouse_button |= RIGHT_BUTTON; 430 388 } 431 else if( !(buttons & SDL_BUTTON(3)) && mouse_buttons[3])389 else if(!(buttons & SDL_BUTTON(3)) && mouse_buttons[3]) 432 390 { 433 391 ev.type = EV_MOUSE_BUTTON; 434 392 mouse_buttons[3] = !mouse_buttons[3]; 435 ev.mouse_button &= ( 0xff - RIGHT_BUTTON);436 } 437 } 393 ev.mouse_button &= (0xff - RIGHT_BUTTON); 394 } 395 } -
abuse/trunk/src/sdlport/video.cpp
r555 r643 43 43 44 44 SDL_Surface *window = NULL, *surface = NULL; 45 image * screen = NULL;45 image *main_screen = NULL; 46 46 int win_xscale, win_yscale, mouse_xscale, mouse_yscale; 47 47 int xres, yres; … … 123 123 124 124 // Create the screen image 125 screen = new image(vec2i(xres, yres), NULL, 2);126 if( screen == NULL)125 main_screen = new image(vec2i(xres, yres), NULL, 2); 126 if(main_screen == NULL) 127 127 { 128 128 // Our screen image is no good, we have to bail. … … 130 130 exit(1); 131 131 } 132 screen->clear();132 main_screen->clear(); 133 133 134 134 if (flags.gl) … … 203 203 SDL_WM_GrabInput(SDL_GRAB_ON); 204 204 205 update_dirty( screen);205 update_dirty(main_screen); 206 206 } 207 207 … … 223 223 SDL_FreeSurface(texture); 224 224 #endif 225 delete screen;225 delete main_screen; 226 226 } 227 227 -
abuse/trunk/src/statbar.cpp
r555 r643 86 86 87 87 int n=num/100; 88 scale_put(cache.img(offset[n]), screen,x,y,dw,dh);88 scale_put(cache.img(offset[n]),main_screen,x,y,dw,dh); 89 89 num-=n*100; 90 90 91 91 x+=dw; n=num/10; 92 scale_put(cache.img(offset[n]), screen,x,y,dw,dh);92 scale_put(cache.img(offset[n]),main_screen,x,y,dw,dh); 93 93 num-=n*10; 94 94 95 95 x+=dw; 96 scale_put(cache.img(offset[num]), screen,x,y,dw,dh);96 scale_put(cache.img(offset[num]),main_screen,x,y,dw,dh); 97 97 } 98 98 … … 264 264 265 265 if (need_rf) 266 redraw( screen);266 redraw(main_screen); 267 267 } 268 268 } -
abuse/trunk/src/view.cpp
r635 r643 308 308 { 309 309 last_weapons[i]=weapons[i]; 310 sbar.draw_ammo( screen,i,weapons[i],current_weapon==i);310 sbar.draw_ammo(main_screen,i,weapons[i],current_weapon==i); 311 311 } 312 312 } … … 637 637 } 638 638 639 int view::handle_event( event &ev)639 int view::handle_event(Event &ev) 640 640 { 641 641 if( ev.type == EV_KEY ) … … 721 721 int h = focus->hp(); 722 722 last_hp=h; 723 sbar.draw_health( screen, focus->hp() );723 sbar.draw_health( main_screen, focus->hp() ); 724 724 } 725 725 else 726 726 { 727 sbar.draw_health( screen, 0 );727 sbar.draw_health( main_screen, 0 ); 728 728 } 729 729 } … … 738 738 // when adding or deleting local players 739 739 { 740 if ( screen)740 if (main_screen) 741 741 { 742 742 int t=total_local_players(); … … 907 907 current_object=o; 908 908 } 909 sbar.redraw( screen);909 sbar.redraw(main_screen); 910 910 911 911 int i; -
abuse/trunk/src/view.h
r555 r643 103 103 void note_upkey(); 104 104 void note_downkey(); 105 int handle_event( event &ev);105 int handle_event(Event &ev); 106 106 void update_scroll(); 107 107 void draw_hp();
Note: See TracChangeset
for help on using the changeset viewer.