Changeset 113Tweet

Timestamp:

Mar 16, 2008, 2:41:59 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Got rid of all the remaining occurrences of WINDOW_FRAME_*.

Location:

abuse/trunk/src

Files:

• dev.cpp (modified) (117 diffs)
• game.cpp (modified) (1 diff)
• imlib/jwindow.cpp (modified) (1 diff)
• loadgame.cpp (modified) (1 diff)
• menu.cpp (modified) (1 diff)
• netcfg.cpp (modified) (1 diff)
• unixnfc.cpp (modified) (2 diffs)

abuse/trunk/src/dev.cpp

@@ -33 +33 @@
 #include "chat.hpp"
 
-/* FIXME: get rid of this */
-#define WINDOW_FRAME_LEFT 0
-#define WINDOW_FRAME_TOP 0
-
 #define make_above_tile(x) ((x)|0x4000)
 char backw_on=0,forew_on=0,show_menu_on=0,ledit_on=0,pmenu_on=0,omenu_on=0,commandw_on=0,tbw_on=0,
@@ -54 +50 @@
   current_space=PERM_SPACE;
 
-  
-  char prog[50]; 
+
+  char prog[50];
   char const *cs=prog;
   strcpy(prog,"(setq section 'game_section)\n");
@@ -109 +105 @@
       f->put_image(screen,cash.img(id),x,y,1);
     else
-      cash.img(id)->put_image(screen,x,y); 
+      cash.img(id)->put_image(screen,x,y);
   }
   virtual int width() { return cash.img(id)->width(); }
@@ -142 +138 @@
 {
   public :
-  amb_cont(int X, int Y, ifield *Next) : scroller(X,Y,ID_NULL,100,wm->font()->height()+2,0,64,Next) 
+  amb_cont(int X, int Y, ifield *Next) : scroller(X,Y,ID_NULL,100,wm->font()->height()+2,0,64,Next)
   { if (player_list) sx=player_list->ambient; }
   virtual void scroll_event(int newx, image *screen)
@@ -159 +155 @@
 int confirm_quit()
 {
-  image *ok_image=cash.img(cash.reg("art/frame.spe","dev_ok",SPEC_IMAGE,1))->copy(),
-        *cancel_image=cash.img(cash.reg("art/frame.spe","cancel",SPEC_IMAGE,1))->copy();
-
-
-  jwindow *quitw=wm->new_window(xres/2+40,yres/2,80,-1,
-                          new button(WINDOW_FRAME_LEFT+10,WINDOW_FRAME_TOP+20,ID_QUIT_OK,ok_image,
-                          new button(WINDOW_FRAME_LEFT+38,WINDOW_FRAME_TOP+20,ID_CANCEL,cancel_image,
-                          new info_field(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,ID_NULL,symbol_str("sure?"),NULL))),
-                                    symbol_str("quit_title"));
-  wm->grab_focus(quitw);
-  int fin=0,quit=0;
-  do
-  {
+    jwindow *quitw;
+    image *ok_image, *cancel_image;
+
+    ok_image = cash.img(cash.reg("art/frame.spe", "dev_ok",
+                                 SPEC_IMAGE, 1))->copy();
+    cancel_image = cash.img(cash.reg("art/frame.spe", "cancel",
+                                     SPEC_IMAGE, 1))->copy();
+
+    quitw = wm->new_window(xres / 2 + 40, yres / 2, 80, -1,
+              new button(10, wm->font()->height() + 4, ID_QUIT_OK, ok_image,
+              new button(38, wm->font()->height() + 4, ID_CANCEL, cancel_image,
+              new info_field(2, 2, ID_NULL, symbol_str("sure?"), NULL))),
+              symbol_str("quit_title"));
+
+    wm->grab_focus(quitw);
+    int fin = 0, quit = 0;
+
+    while(!fin)
+    {
+        wm->flush_screen();
+
+        event ev;
+        wm->get_event(ev);
+        if(ev.type == EV_MESSAGE && ev.message.id == ID_QUIT_OK)
+            fin = quit = 1;
+        else if(ev.type == EV_MESSAGE && ev.message.id == ID_CANCEL)
+            fin = 1;
+        else if(ev.type == EV_KEY
+                 && toupper(ev.key) == toupper(*symbol_str("YES")))
+            fin = quit = 1;
+        else if(ev.type == EV_KEY
+                 && toupper(ev.key) == toupper(*symbol_str("NO")))
+            fin = 1;
+        if((ev.type == EV_KEY && ev.key == JK_ESC)
+           || ev.type == EV_CLOSE_WINDOW)
+            fin = 1;
+    }
+
+    delete ok_image;
+    delete cancel_image;
+
+    the_game->reset_keymap();
+
+    wm->close_window(quitw);
     wm->flush_screen();
-
-    event ev;
-    wm->get_event(ev);
-    if (ev.type==EV_MESSAGE && ev.message.id==ID_QUIT_OK)
-      fin=quit=1;
-    else if (ev.type==EV_MESSAGE && ev.message.id==ID_CANCEL)
-      fin=1;
-    else if (ev.type==EV_KEY && toupper(ev.key)==toupper(*symbol_str("YES")))
-      fin=quit=1;
-    else if (ev.type==EV_KEY && toupper(ev.key)==toupper(*symbol_str("NO")))
-      fin=1;
-    if ((ev.type==EV_KEY && ev.key==JK_ESC) || ev.type==EV_CLOSE_WINDOW) fin=1;
- 
-  } while (!fin);
-  delete ok_image;
-  delete cancel_image;
-
-  the_game->reset_keymap();
-
-  wm->close_window(quitw);
-  wm->flush_screen();
-  return quit;
+    return quit;
 }
 
@@ -200 +206 @@
 {
   int total=0,number=0;
-  game_object *c;  
+  game_object *c;
   for (c=current_level->first_object();c;c=c->next)
   {
@@ -213 +219 @@
 void dev_controll::search_backward()
 { ;
-} 
+}
 
 
@@ -222 +228 @@
                             (the_game->first_view->cx2-the_game->first_view->cx1+1)*2;
   the_game->first_view->cy2=the_game->first_view->cy1+
-                            (the_game->first_view->cy2-the_game->first_view->cy1+1)*2;              
+                            (the_game->first_view->cy2-the_game->first_view->cy1+1)*2;
   delete small_render;
   small_render=NULL;
@@ -238 +244 @@
 
   small_render=new image((the_game->first_view->cx2-the_game->first_view->cx1+1),
-                         (the_game->first_view->cy2-the_game->first_view->cy1+1),NULL,2);
+             (the_game->first_view->cy2-the_game->first_view->cy1+1),NULL,2);
 }
 
@@ -260 +266 @@
     } else
     {
-      game_object *first,*find=NULL;      
+      game_object *first,*find=NULL;
       if (!search_object || search_object->otype!=type)
         first=current_level->first_object();
@@ -267 +273 @@
       for (;!find && first;first=first->next)
         if (first->otype==type)
-          find=first;
+      find=first;
       int loop=0;
       if (!find)
       {
-        for (first=current_level->first_object();first && !find;first=first->next)
-        {
-          if (first->otype==type)
-            find=first;
-        }
-        loop=1;
+    for (first=current_level->first_object();first && !find;first=first->next)
+    {
+      if (first->otype==type)
+        find=first;
+    }
+    loop=1;
       }
       if (find)
       {
         search_object=find;
-        show_object_number(search_object);
+    show_object_number(search_object);
       }
       else
       {
-        the_game->show_help("No object matching name exsist in level\n");
-        
+    the_game->show_help("No object matching name exsist in level\n");
+
       }
     }
@@ -299 +305 @@
   else if (wm->key_pressed(JK_ALT_L) || wm->key_pressed(JK_ALT_R))
     return x-(x%the_game->ftile_width())+the_game->ftile_width()/2;
-  else return x;  
+  else return x;
 }
 
@@ -313 +319 @@
 void dev_controll::make_ambient()
 {
-  if (!ambw)
-  ambw=wm->new_window(prop->getd("ambient x",-1),
-                      prop->getd("ambient y",-1),-1,-1,
-                      new amb_cont(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,NULL),"ambient");
+    if(ambw)
+        return;
+
+    ambw = wm->new_window(prop->getd("ambient x", -1),
+                          prop->getd("ambient y", -1), -1, -1,
+                          new amb_cont(0, 0, NULL), "ambient");
 }
 
@@ -324 +332 @@
   {
     put_string("unchop x y, size x y,\n"
-               "load, esave, name\n");
-  } else 
+           "load, esave, name\n");
+  } else
   {
     event ev;
@@ -352 +360 @@
   for (int i=0;i<DEV_MODES;i++)
     dev_mode_icon[i]=cash.reg(artf,dev_mode_icon_names[i],SPEC_IMAGE,0);
-  
+
 }
 
@@ -382 +390 @@
   if (y+new_height>cy2)
     new_height-=y+new_height-cy2;
-  
+
 
   for (iy=iy_start;new_height>0;new_height--,y++,iy+=ystep)
@@ -389 +397 @@
     sl2=screen->scan_line(y)+x;
     for (ix=ix_start,sx=0;sx<new_width;sx++,ix+=xstep,sl2++)
-      *sl2=sl1[ix>>16];    
+      *sl2=sl1[ix>>16];
   }
 }
@@ -421 +429 @@
   if (y+new_height>cy2)
     new_height-=y+new_height-cy2;
-  
+
   uint8_t d;
   for (iy=iy_start;new_height>0;new_height--,y++,iy+=ystep)
@@ -459 +467 @@
   {
     int32_t vx=v->xoff(),vy=v->yoff();
-  
+
     if (dev&DRAW_LINKS)
     {
       for (light_source *f=first_light_source;f;f=f->next)
       {
-        if (f->x-vx>=0 && f->x-vx<=(v->cx2-v->cx1+1) && f->y-vy>=0 && f->y-vy<=(v->cy2-v->cy1+1))
-        {
-          image *im=cash.img(light_buttons[f->type]);
-          im->put_image(screen,f->x-vx+v->cx1-im->width()/2,f->y-vy+v->cy1-im->height()/2,1);
-          screen->rectangle(f->x1-vx+v->cx1,f->y1-vy+v->cy1,f->x2-vx+v->cx1,f->y2-vy+v->cy1,
-                            wm->medium_color());
-        }
+    if (f->x-vx>=0 && f->x-vx<=(v->cx2-v->cx1+1) && f->y-vy>=0 && f->y-vy<=(v->cy2-v->cy1+1))
+    {
+      image *im=cash.img(light_buttons[f->type]);
+      im->put_image(screen,f->x-vx+v->cx1-im->width()/2,f->y-vy+v->cy1-im->height()/2,1);
+      screen->rectangle(f->x1-vx+v->cx1,f->y1-vy+v->cy1,f->x2-vx+v->cx1,f->y2-vy+v->cy1,
+                wm->medium_color());
+    }
       }
     }
@@ -477 +485 @@
     {
       int32_t rx1,ry1;
-      the_game->game_to_mouse(link_object->x,link_object->y,v,rx1,ry1);      
-      screen->line(rx1,ry1,dlastx,dlasty,yellow);            
+      the_game->game_to_mouse(link_object->x,link_object->y,v,rx1,ry1);
+      screen->line(rx1,ry1,dlastx,dlasty,yellow);
     }
 
@@ -486 +494 @@
       int l=i->width()/2,h=i->height()/2;
       int32_t rx1,ry1;
-      the_game->game_to_mouse(selected_light->x,selected_light->y,v,rx1,ry1);      
+      the_game->game_to_mouse(selected_light->x,selected_light->y,v,rx1,ry1);
       screen->rectangle(rx1-l,ry1-h,rx1+l,ry1+h,wm->bright_color());
     }
@@ -494 +502 @@
       for (o=current_level->first_object();o;o=o->next)
       {
-        the_game->game_to_mouse(o->x,o->y,current_view,x1,y1);
-        char *nm=object_names[o->otype];
-        console_font->put_string(screen,x1-strlen(nm)*console_font->width()/2,y1+2,nm);
-      }
-    
+    the_game->game_to_mouse(o->x,o->y,current_view,x1,y1);
+    char *nm=object_names[o->otype];
+    console_font->put_string(screen,x1-strlen(nm)*console_font->width()/2,y1+2,nm);
+      }
+
     if (dev&DRAW_LINKS)
     {
@@ -504 +512 @@
       for (o=current_level->first_object();o;o=o->next)
       {
-        the_game->game_to_mouse(o->x,o->y,current_view,x1,y1);
-
-        int i=0;
-        for (;i<o->total_objects();i++)
-        {
-          game_object *other=o->get_object(i);
-          the_game->game_to_mouse(other->x,other->y,current_view,x2,y2);        
-          screen->line(x1,y1,x2,y2,wm->bright_color());
-        }
-
-        for (i=0;i<o->total_lights();i++)
-        {
-          light_source *l=o->get_light(i);
-          the_game->game_to_mouse(l->x,l->y,current_view,x2,y2);
-          screen->line(x1,y1,x2,y2,light_connection_color);
-        }
+    the_game->game_to_mouse(o->x,o->y,current_view,x1,y1);
+
+    int i=0;
+    for (;i<o->total_objects();i++)
+    {
+      game_object *other=o->get_object(i);
+      the_game->game_to_mouse(other->x,other->y,current_view,x2,y2);
+      screen->line(x1,y1,x2,y2,wm->bright_color());
+    }
+
+    for (i=0;i<o->total_lights();i++)
+    {
+      light_source *l=o->get_light(i);
+      the_game->game_to_mouse(l->x,l->y,current_view,x2,y2);
+      screen->line(x1,y1,x2,y2,light_connection_color);
+    }
 
       }
@@ -525 +533 @@
 
     if (selected_object)
-    {    
-      selected_object->picture_space(x1,y1,x2,y2);    
+    {
+      selected_object->picture_space(x1,y1,x2,y2);
       int32_t rx1,ry1,rx2,ry2;
       the_game->game_to_mouse(x1,y1,v,rx1,ry1);
@@ -535 +543 @@
       for (int i=0;i<selected_object->total_objects();i++)
       {
-        game_object *other=selected_object->get_object(i);
-        the_game->game_to_mouse(other->x,other->y,current_view,x2,y2);
-        screen->line(x1,y1,x2,y2,light_connection_color);
-      }
-    }  
+    game_object *other=selected_object->get_object(i);
+    the_game->game_to_mouse(other->x,other->y,current_view,x2,y2);
+    screen->line(x1,y1,x2,y2,light_connection_color);
+      }
+    }
 
 
@@ -564 +572 @@
 void dev_controll::update_memprof()
 {
-  if (memprof)
-  {
+    if(!memprof)
+        return;
+
     int i;
-    int total,*st,*ch;
-    small_static_allocation_summary(total,st,ch); 
-
-    int x=WINDOW_FRAME_LEFT;
-    int y=WINDOW_FRAME_TOP;
+    int total, *st, *ch;
+    small_static_allocation_summary(total, st, ch);
+
+    int h, x = 0, y = 0;
     memprof->clear();
 
-    for (i=0;i<total;i++)
-    {
-      int h=st[i]*100/3000;  x++;
-      memprof->screen->bar(x,y,x,y+h,wm->bright_color());
-      h=ch[i]*100/3000;
-      memprof->screen->bar(x,y,x,y+h,wm->medium_color());
-      x++;
+    for(i = 0; i < total; i++)
+    {
+        x++;
+        h = st[i] * 100 / 3000;
+        memprof->screen->bar(x, y, x, y + h, wm->bright_color());
+        h = ch[i] * 100 / 3000;
+        memprof->screen->bar(x, y, x, y + h, wm->medium_color());
+        x++;
     }
     jfree(st);
     jfree(ch);
     char buf[100];
-    sprintf(buf,"%8ld %8ld",(long int)j_allocated(),(long int)j_available());
-    wm->font()->put_string(memprof->screen,memprof->x1(),memprof->y2()-wm->font()->height(),buf);
-
-  }
-  
+    sprintf(buf, "%8ld %8ld", (long int)j_allocated(), (long int)j_available());
+    wm->font()->put_string(memprof->screen, memprof->x1(),
+                           memprof->y2() - wm->font()->height(), buf);
 }
 
@@ -607 +614 @@
     jfree(ch);
     memprof=wm->new_window(0,0,total*2+20,100,NULL);
-    update_memprof();   
+    update_memprof();
   }
 }
@@ -631 +638 @@
     }
 
-    tool_picker *tp=new tool_picker(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP, 
-                                             ID_NULL,
-                                             5,(visual_object **)dev_mode_pict,dev_mode_ids,DEV_MODES,
-                                                pal,pal,NULL);
+    tool_picker *tp=new tool_picker(0, 0,
+                         ID_NULL,
+                         5,(visual_object **)dev_mode_pict,dev_mode_ids,DEV_MODES,
+                        pal,pal,NULL);
     tbw=wm->new_window(prop->getd("toolbar x",-1),
-                       prop->getd("toolbar y",-1),-1,-1,tp);
+               prop->getd("toolbar y",-1),-1,-1,tp);
     tp->set_x(setx,tbw->screen);
   }
@@ -643 +650 @@
 void dev_controll::toggle_show_menu()
 {
-  if (show_menu)
-  {
-    show_menu_on=0;
-    prop->setd("layer x",show_menu->x);
-    prop->setd("layer y",show_menu->y);
-    wm->close_window(show_menu);
-    show_menu=NULL;
-  } else
-  {
-    show_menu_on=1;
-    int sx=WINDOW_FRAME_LEFT,sy=WINDOW_FRAME_TOP;
-
-    button *lnb=new button(sx,sy+100,SHOW_LINKS,            symbol_str("l_links"),NULL);           if (dev&DRAW_LINKS)          lnb->push();
-    button *lb=new button(sx,sy+80,  SHOW_LIGHT,            symbol_str("l_light"),lnb);          if (dev&DRAW_LIGHTS)         lb->push();
-    button *cb=new button(sx,sy+60,  SHOW_CHARACTERS,       symbol_str("l_char"),lb);       if (dev&DRAW_PEOPLE_LAYER)   cb->push();
-    button *bb=new button(sx,sy+40,  SHOW_BACKGROUND,       symbol_str("l_back"),cb);       if (dev&DRAW_BG_LAYER)       bb->push();
-    button *bdb=new button(sx,sy+20, SHOW_FOREGROUND_BOUND, symbol_str("l_bound"),bb); if (dev&DRAW_FG_BOUND_LAYER) bdb->push();
-    button *fb=new button(sx,sy+ 0,  SHOW_FOREGROUND,       symbol_str("l_fore"),bdb);      if (dev&DRAW_FG_LAYER)       fb->push();
-
-    show_menu=wm->new_window(prop->getd("layer x",-1),
-                             prop->getd("layer y",-1),
-                             -1,-1,fb,symbol_str(symbol_str("SHOW?")));
-  }
-}
-
+    if(show_menu)
+    {
+        show_menu_on = 0;
+        prop->setd("layer x", show_menu->x);
+        prop->setd("layer y", show_menu->y);
+        wm->close_window(show_menu);
+        show_menu = NULL;
+        return;
+    }
+
+    show_menu_on = 1;
+
+    button *lnb, *lb, *cb, *bb, *bdb, *fb;
+
+    lnb = new button(0, 100, SHOW_LINKS, symbol_str("l_links"), NULL);
+    if(dev & DRAW_LINKS)
+        lnb->push();
+    lb = new button(0, 80, SHOW_LIGHT, symbol_str("l_light"), lnb);
+    if(dev & DRAW_LIGHTS)
+        lb->push();
+    cb = new button(0, 60, SHOW_CHARACTERS, symbol_str("l_char"), lb);
+    if(dev & DRAW_PEOPLE_LAYER)
+        cb->push();
+    bb = new button(0, 40, SHOW_BACKGROUND, symbol_str("l_back"), cb);
+    if(dev & DRAW_BG_LAYER)
+        bb->push();
+    bdb = new button(0, 20, SHOW_FOREGROUND_BOUND, symbol_str("l_bound"), bb);
+    if(dev & DRAW_FG_BOUND_LAYER)
+        bdb->push();
+    fb = new button(0, 0, SHOW_FOREGROUND, symbol_str("l_fore"), bdb);
+    if(dev & DRAW_FG_LAYER)
+        fb->push();
+
+    show_menu = wm->new_window(prop->getd("layer x", -1),
+                               prop->getd("layer y", -1), -1, -1,
+                               fb, symbol_str(symbol_str("SHOW?")));
+}
 
 char **listable_objs=NULL;
@@ -674 +693 @@
 void dev_controll::toggle_omenu()
 {
-  if (omenu)
-  {
-    omenu_on=0;
-    prop->setd("objects x",omenu->x);
-    prop->setd("objects y",omenu->y);
-    wm->close_window(omenu);
-    omenu=NULL;
-    jfree(listable_objs);
-    listable_objs=NULL;
-  }
-  else
-  {
-    omenu_on=1;
-    total_listable=0;
-    int i=0;
-    for (;i<total_objects;i++)
-      if (!figures[i]->get_cflag(CFLAG_UNLISTABLE))
-        total_listable++;
-    listable_objs=(char **)jmalloc(sizeof(char *)*total_listable,"omenu list");
-    int c=0;   
-    for (i=0;i<total_objects;i++)
-      if (!figures[i]->get_cflag(CFLAG_UNLISTABLE))
-      {
-        listable_objs[c]=object_names[i];
-        c++;
-      }
-              
-    omenu=wm->new_window(prop->getd("objects x",0),
-                         prop->getd("objects y",0),-1,-1,
-                         new pick_list(WINDOW_FRAME_LEFT,
-                                       WINDOW_FRAME_TOP,DEV_CREATE,yres/wm->font()->height()/2,
-                                       listable_objs,total_listable,0,NULL,cash.img(window_texture)));
-  }  
-} 
+    if(omenu)
+    {
+        omenu_on = 0;
+        prop->setd("objects x", omenu->x);
+        prop->setd("objects y", omenu->y);
+        wm->close_window(omenu);
+        omenu = NULL;
+        jfree(listable_objs);
+        listable_objs = NULL;
+        return;
+    }
+
+    omenu_on = 1;
+    total_listable = 0;
+
+    int i, c;
+
+    for(i = 0; i < total_objects; i++)
+        if(!figures[i]->get_cflag(CFLAG_UNLISTABLE))
+            total_listable++;
+    listable_objs = (char **)jmalloc(sizeof(char *) * total_listable, "omenu list");
+
+    for(i = 0, c = 0; i < total_objects; i++)
+        if(!figures[i]->get_cflag(CFLAG_UNLISTABLE))
+        {
+            listable_objs[c] = object_names[i];
+            c++;
+        }
+
+    omenu = wm->new_window(prop->getd("objects x", 0),
+                           prop->getd("objects y", 0), -1, -1,
+                           new pick_list(0, 0, DEV_CREATE,
+                                         yres / wm->font()->height() / 2,
+                                         listable_objs, total_listable, 0,
+                                         NULL, cash.img(window_texture)));
+}
 
 static int get_omenu_item(int x)
@@ -719 +740 @@
 void dev_controll::toggle_pmenu()
 {
-  if (pmenu)
-  {
-    pmenu_on=0;
-    prop->setd("pal x",pmenu->x);
-    prop->setd("pal y",pmenu->y);
-    wm->close_window(pmenu);
-    pmenu=NULL;
-    jfree(pwin_list);
-  }
-  else if (total_pals)
-  {
-    pmenu_on=1;
-    pwin_list=(char **)jmalloc(total_pals*sizeof(char *),"pal pick list");
-    int i;
-    for (i=0;i<total_pals;i++)
-      pwin_list[i]=pal_wins[i]->name;
-
-    pmenu=wm->new_window(prop->getd("pal x",0),
-                         prop->getd("pal y",-1),
-                         -1,-1,
-                         new pick_list(WINDOW_FRAME_LEFT,
-                                       WINDOW_FRAME_TOP,DEV_PALETTE,yres/wm->font()->height()/2,
-                                       pwin_list,total_pals,0,NULL,cash.img(window_texture)));
-  } else the_game->show_help(symbol_str("no_pals"));
-} 
+    if(pmenu)
+    {
+        pmenu_on = 0;
+        prop->setd("pal x", pmenu->x);
+        prop->setd("pal y", pmenu->y);
+        wm->close_window(pmenu);
+        pmenu = NULL;
+        jfree(pwin_list);
+        return;
+    }
+
+    if(!total_pals)
+    {
+        the_game->show_help(symbol_str("no_pals"));
+        return;
+    }
+
+    pmenu_on = 1;
+
+    pwin_list = (char **)jmalloc(total_pals * sizeof(char *), "pal pick list");
+    for(int i = 0; i < total_pals; i++)
+        pwin_list[i] = pal_wins[i]->name;
+
+    pmenu = wm->new_window(prop->getd("pal x",0),
+                           prop->getd("pal y",-1), -1,-1,
+                           new pick_list(0, 0, DEV_PALETTE,
+                                         yres / wm->font()->height() / 2,
+                                         pwin_list, total_pals, 0, NULL,
+                                         cash.img(window_texture)));
+}
 
 
 void dev_controll::toggle_fgw()
 {
-  if (!forew)
-  {
-    forew_on=0;
-    int maxh=(yres-25)/(the_game->ftile_height()/fg_scale);
-
-    tile_picker *f_tp=new tile_picker(WINDOW_FRAME_LEFT+1,WINDOW_FRAME_TOP+1,
-                                         DEV_FG_PICKER,SPEC_FORETILE,fg_scale,maxh,fg_w,NULL);
+    if(forew)
+    {
+        forew_on = 1;
+        prop->setd("fore x", forew->x);
+        prop->setd("fore y", forew->y);
+        wm->close_window(forew);
+        forew = NULL;
+        return;
+    }
+
+    /* FIXME: shouldn't this be 1? */
+    forew_on = 0;
+    int maxh = (yres - 25) / (the_game->ftile_height() / fg_scale);
+
+    /* FIXME: previous code had 1 instead of 0, investigate */
+    tile_picker *f_tp = new tile_picker(0, 0, DEV_FG_PICKER, SPEC_FORETILE,
+                                        fg_scale, maxh, fg_w, NULL);
     f_tp->reverse();
 
-    forew=wm->new_window(prop->getd("fore x",-30),
-                         prop->getd("fore y",0),
-                         -1,-1,
-                         f_tp,symbol_str("l_fg"));
+    forew = wm->new_window(prop->getd("fore x", -30), prop->getd("fore y", 0),
+                           -1, -1, f_tp,symbol_str("l_fg"));
+}
+
+void dev_controll::toggle_music_window()
+{
+/*  if (!music_window)
+  {
+    music_window=wm->new_window(-1,30,0,0,
+             new pick_list(0,0,DEV_MUSIC_PICKLIST,10,song_list,total_songs,0,NULL));
+    wm->fnt->put_string(music_window->screen,0,1,"songs");
   } else
-  { 
-    forew_on=1;
-    prop->setd("fore x",forew->x);
-    prop->setd("fore y",forew->y);
-    wm->close_window(forew);
-    forew=NULL;
-  }
-}
-
-void dev_controll::toggle_music_window()
-{
-/*  if (!music_window)
-  {
-    music_window=wm->new_window(-1,30,0,0,
-                         new pick_list(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,
-                                       DEV_MUSIC_PICKLIST,10,song_list,total_songs,0,NULL));
-    wm->fnt->put_string(music_window->screen,WINDOW_FRAME_LEFT,1,"songs");
-  } else
-  { 
+  {
     wm->close_window(music_window);
     music_window=NULL;
@@ -788 +813 @@
 void dev_controll::toggle_bgw()
 {
-  if (!backw)
-  {
-    backw_on=0;
-    int maxh=(yres-25)/(the_game->btile_height()/bg_scale);
-
-    backw=wm->new_window(prop->getd("back x",-30),
-                         prop->getd("back y",0),
-                         -1,-1,
-                         new tile_picker(WINDOW_FRAME_LEFT+1,WINDOW_FRAME_TOP+1,
-                                         DEV_BG_PICKER,SPEC_BACKTILE,bg_scale,maxh,bg_w,NULL),symbol_str("l_bg"));
-  } else
-  { 
-    backw_on=1;
-    prop->setd("back x",backw->x);
-    prop->setd("back y",backw->y);
-    wm->close_window(backw);
-    backw=NULL;
-  }
+    if(backw)
+    {
+        backw_on = 1;
+        prop->setd("back x", backw->x);
+        prop->setd("back y", backw->y);
+        wm->close_window(backw);
+        backw = NULL;
+        return;
+    }
+
+    /* FIXME: shouldn't this be 1? */
+    backw_on = 0;
+    int maxh = (yres - 25) / (the_game->btile_height() / bg_scale);
+
+    /* FIXME: previous code had 1 instead of 0, investigate */
+    tile_picker *f_tp = new tile_picker(0, 0, DEV_BG_PICKER, SPEC_BACKTILE,
+                                        bg_scale, maxh, bg_w, NULL);
+    forew = wm->new_window(prop->getd("back x", -30), prop->getd("back y", 0),
+                           -1, -1, f_tp,symbol_str("l_bg"));
 }
 
 void dev_controll::toggle_search_window()
 {
-  if (!search_window)
-  {
-    int wl=WINDOW_FRAME_LEFT+1,
-        wh=WINDOW_FRAME_TOP+1;
-    int bw=cash.img(dev_forward)->width();
-    search_window=wm->new_window(prop->getd("searchw x",-30),
-                                 prop->getd("searchw y",0),
-                                 -1,-1,
-                                 new text_field(wl,wh,ID_SEARCH_TEXT,"object name>",
-                                                "***************************",
-                                                prop->get("search name",""),
-                                  new button(wl+bw*1,wh+wm->font()->height()+5,ID_SEARCH_BACKWARD,
-                                            cash.img(dev_backward),
-                                  new button(wl+bw*3,wh+wm->font()->height()+5,ID_SEARCH_FOREWARD,
-                                            cash.img(dev_forward),NULL))),"SEARCH");
-    searchw_on=0;
-  } else
-  {
-    searchw_on=1; 
-    prop->setd("searchw x",search_window->x);
-    prop->setd("searchw y",search_window->y);
-    prop->set("search name",search_window->read(ID_SEARCH_TEXT));
-    wm->close_window(search_window);
-    search_window=NULL;
-    search_object=NULL;
-  }
+    if(search_window)
+    {
+        searchw_on = 1;
+        prop->setd("searchw x", search_window->x);
+        prop->setd("searchw y", search_window->y);
+        prop->set("search name", search_window->read(ID_SEARCH_TEXT));
+        wm->close_window(search_window);
+        search_window = NULL;
+        search_object = NULL;
+        return;
+    }
+
+    int bw = cash.img(dev_forward)->width();
+    /* FIXME: previous code had 1,1 instead of 0,0 -- investigate */
+    search_window = wm->new_window(prop->getd("searchw x", -30),
+                                   prop->getd("searchw y", 0), -1, -1,
+        new text_field(0, 0, ID_SEARCH_TEXT, "object name>",
+                       "***************************",
+                       prop->get("search name", ""),
+        new button(bw, wm->font()->height() + 5, ID_SEARCH_BACKWARD,
+                   cash.img(dev_backward),
+        new button(bw * 3, wm->font()->height() + 5, ID_SEARCH_FOREWARD,
+                   cash.img(dev_forward), NULL))), "SEARCH");
+
+    /* FIXME: shouldn't this be 1? */
+    searchw_on = 0;
 }
 
@@ -847 +873 @@
 {
   scale_mult=1;
-  scale_div=1; 
+  scale_div=1;
   dev=0;
   int i;
@@ -854 +880 @@
 
   for (i=1;i<argc;i++)
-  {    
+  {
     if (!strcmp(argv[i],"-edit"))
     {
-      dev|=EDIT_MODE;    
+      dev|=EDIT_MODE;
       start_edit=1;
       start_running=1;
@@ -868 +894 @@
     }
     else if (!strcmp(argv[i],"-fwin"))
-      open_fwin=1;    
+      open_fwin=1;
     else if (!strcmp(argv[i],"-show_mem"))
-      start_mem=1;    
+      start_mem=1;
     else if (!strcmp(argv[i],"-bwin"))
-      open_bwin=1;          
+      open_bwin=1;
     else if (!strcmp(argv[i],"-owin"))
-      open_owin=1;        
+      open_owin=1;
     else if (!strcmp(argv[i],"-nodelay"))
       start_nodelay=1;
@@ -880 +906 @@
 /*    else if (!strcmp(argv[i],"-scale"))
     {
-      i++;      
+      i++;
       scale_mult=atoi(argv[i++]);
       scale_div=atoi(argv[i]);
@@ -893 +919 @@
       demo_start=1;
 
-  }  
+  }
 
   if (get_option("-no_autolight"))
@@ -938 +964 @@
   search_object = NULL;
   memprof=NULL;
-  oedit=NULL;  
+  oedit=NULL;
   forew=NULL;
-  backw=NULL;  
-  omenu=NULL;  
+  backw=NULL;
+  omenu=NULL;
   ledit=NULL;
   pmenu=NULL;
@@ -961 +987 @@
     the_game->draw();
   }
-  
+
   dev_console=new dev_term(50,18,this);
   if (start_edit)
-    dev_menu=make_menu(0,yres-wm->font()->height()-5);    
+    dev_menu=make_menu(0,yres-wm->font()->height()-5);
 
   if (get_option("-nolight"))
@@ -980 +1006 @@
 
 void dev_controll::load_stuff()
-{  
+{
   if (dev & EDIT_MODE)
   {
@@ -1004 +1030 @@
   if (command[0]=='(')            // is this a lisp command?
   {
-    eval(compile(command));  
+    eval(compile(command));
     return ;
   }
@@ -1018 +1044 @@
       while (o)
       {
-        dprintf("%s %d %d %d %d\n",object_names[o->otype],o->x,o->y,
-                figures[o->otype]->rangex,
-                figures[o->otype]->rangey
-                );
-        o=o->next_active;
+    dprintf("%s %d %d %d %d\n",object_names[o->otype],o->x,o->y,
+        figures[o->otype]->rangex,
+        figures[o->otype]->rangey
+        );
+    o=o->next_active;
       }
     }
@@ -1034 +1060 @@
       int i;
       for (i=0;i<total_weapons;i++)
-        f->weapons[i]=-1;
+    f->weapons[i]=-1;
 
       if (total_weapons)
@@ -1051 +1077 @@
       int32_t *w=(int32_t *)jmalloc(total_weapons*sizeof(int32_t),"tmp weapon array");
       memcpy(w,player_list->weapons,total_weapons*sizeof(int32_t));
-      
+
       char tmp[100];
       strcpy(tmp,current_level->name());
@@ -1063 +1089 @@
       player_list->focus->y=cy;
 
-      memcpy(player_list->weapons,w,total_weapons*sizeof(int32_t));     
+      memcpy(player_list->weapons,w,total_weapons*sizeof(int32_t));
       jfree(w);
 
       the_game->need_refresh();
-    }    
+    }
   }
 
@@ -1078 +1104 @@
       if (sscanf(command,"%s%d%d",fword,&l,&h)==3)
       {
-        dprintf("unchopped %dx%d to ",l,h);
-        l=(l+the_game->btile_width()-1)/the_game->btile_width();
-        h=(h+the_game->btile_height()-1)/the_game->btile_height();
-        for (y=0,i=cur_bg;y<h;y++)
+    dprintf("unchopped %dx%d to ",l,h);
+    l=(l+the_game->btile_width()-1)/the_game->btile_width();
+    h=(h+the_game->btile_height()-1)/the_game->btile_height();
+    for (y=0,i=cur_bg;y<h;y++)
           for (x=0;x<l;x++)
-            the_game->put_bg(rx+x,ry+y,i++); 
-        dprintf("%dx%d\n",l,h);
+            the_game->put_bg(rx+x,ry+y,i++);
+    dprintf("%dx%d\n",l,h);
       } else dprintf(symbol_str("unchop1"));
 
-    }      
-  } 
+    }
+  }
   if (!strcmp(fword,"center"))
   {
@@ -1102 +1128 @@
   if (!strcmp(fword,"size"))
   {
-    int l,w;    
+    int l,w;
     if (sscanf(command,"%s%d%d",fword,&l,&w)==3)
     {
-      current_level->set_size(l,w);    
+      current_level->set_size(l,w);
       dprintf("level is now %dx%d\n",l,w);
     } else dprintf(symbol_str("size1"));
@@ -1115 +1141 @@
     while (*command && *command!=' ') command++;
     if (*command)
-      current_level->set_name(command+1);    
+      current_level->set_name(command+1);
     dprintf(symbol_str("name_now"),current_level->name());
   }
@@ -1121 +1147 @@
   {
     strcpy(level_file,st);
-    dprintf("first level will be '%s'\n",level_file);      
+    dprintf("first level will be '%s'\n",level_file);
   }
 
@@ -1130 +1156 @@
 
     dprintf("loading '%s'\n",st);
-    the_game->load_level(st);    
+    the_game->load_level(st);
     current_level->unactivate_all();
 
@@ -1138 +1164 @@
   if (!strcmp(fword,"mem"))
   {
-    if (st[0])    
+    if (st[0])
       show_char_mem(st);
     else show_mem();
@@ -1150 +1176 @@
 
   if (!strcmp(fword,"delete"))
-  {      
+  {
     if (selected_object)
     {
@@ -1156 +1182 @@
         the_game->show_help(symbol_str("nd_player"));
       else
-      {      
-        if (selected_object->controller())
-          the_game->show_help(symbol_str("nd_player"));
-        else
-        {
-          current_level->delete_object(selected_object);
-          if (S_DELETE_SND>0) cash.sfx(S_DELETE_SND)->play(sfx_volume/2);
-          selected_object=NULL; 
-        }
+      {
+    if (selected_object->controller())
+      the_game->show_help(symbol_str("nd_player"));
+    else
+    {
+      current_level->delete_object(selected_object);
+      if (S_DELETE_SND>0) cash.sfx(S_DELETE_SND)->play(sfx_volume/2);
+      selected_object=NULL;
+    }
       }
     } else if (selected_light)
@@ -1170 +1196 @@
       if (!edit_light)
       {
-        if (current_level)
-        {
+    if (current_level)
+    {
           current_level->remove_light(selected_light);
-          if (S_DELETE_SND>0) cash.sfx(S_DELETE_SND)->play(sfx_volume/2);
-        }
-        else
+      if (S_DELETE_SND>0) cash.sfx(S_DELETE_SND)->play(sfx_volume/2);
+    }
+    else
           delete_light(selected_light);
-        selected_light=NULL;
-      }      
+    selected_light=NULL;
+      }
     } else the_game->show_help(symbol_str("d_nosel"));
     the_game->need_refresh();
@@ -1209 +1235 @@
   if (!strcmp(fword,"move"))
   {
-    if (selected_object)   
-      edit_object=selected_object;        
+    if (selected_object)
+      edit_object=selected_object;
 
     if (edit_object)
       state=DEV_MOVE_OBJECT;
     else the_game->show_help("No object selected");
-      
+
   }
   if (!strcmp(fword,"move_light"))
   {
-    if (selected_light)   
-      edit_light=selected_light;          
+    if (selected_light)
+      edit_light=selected_light;
 
     if (edit_light)
       state=DEV_MOVE_LIGHT;
     else the_game->show_help("No light selected");
-      
-  }
-
-  
+
+  }
+
+
   if (!strcmp(fword,"clear_auto"))
   {
@@ -1242 +1268 @@
     the_game->ftile_on(dlastx,dlasty,x,y);
     if (x>=0 && y>=0 && x<current_level->foreground_width() &&
-        y<current_level->foreground_height())
+    y<current_level->foreground_height())
     {
       cur_fg=current_level->get_fg(x,y);
-      if (forew)      
-        ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen);      
+      if (forew)
+    ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen);
       the_game->need_refresh();
     }
@@ -1256 +1282 @@
     the_game->ftile_on(dlastx,dlasty,x,y);
     if (x>=0 && y>=0 && x<current_level->foreground_width() &&
-        y<current_level->foreground_height())    
-      current_level->fg_set_raised(x,y,!current_level->fg_raised(x,y));    
-  }
-  
+    y<current_level->foreground_height())
+      current_level->fg_set_raised(x,y,!current_level->fg_raised(x,y));
+  }
+
   if (!strcmp(fword,"fg_add"))
   {
@@ -1269 +1295 @@
       if (cur_fg>=nforetiles) cur_fg=nforetiles-1;
 
-      if (forew)      
-        ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen);      
-    }   
+      if (forew)
+    ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen);
+    }
   }
 
@@ -1290 +1316 @@
     game_object *which=selected_object;
     if (!selected_object) which=edit_object;
-    if (which)    
+    if (which)
       current_level->to_front(which);
     else the_game->show_help(symbol_str("forward?"));
@@ -1299 +1325 @@
     game_object *which=selected_object;
     if (!selected_object) which=edit_object;
-    if (which)    
+    if (which)
       current_level->to_back(which);
-    else the_game->show_help(symbol_str("back?")); 
+    else the_game->show_help(symbol_str("back?"));
   }
 
@@ -1308 +1334 @@
     game_object *which=selected_object;
     if (!selected_object) which=edit_object;
-    if (which)    
+    if (which)
     {
       int x;
       if (*st && sscanf(st,"%d",&x)!=EOF)
         which->change_aitype(x);
-      else 
-      {
-        switch (ev.key)
-        {
-          case '0' : which->change_aitype(0); break;
-          case '1' : which->change_aitype(1); break;
-          case '2' : which->change_aitype(2); break;
-          case '3' : which->change_aitype(3); break;
-          case '4' : which->change_aitype(4); break;
-          case '5' : which->change_aitype(5); break;
-          case '6' : which->change_aitype(6); break;
-          case '7' : which->change_aitype(7); break;
-          case '8' : which->change_aitype(8); break;
-          case '9' : which->change_aitype(9); break;
-          case ')' : which->change_aitype(10); break;
-          case '!' : which->change_aitype(11); break;
-          case '@' : which->change_aitype(12); break;
-          case '#' : which->change_aitype(13); break;
-          case '$' : which->change_aitype(14); break;
-          case '%' : which->change_aitype(15); break;
-          case '^' : which->change_aitype(16); break;
-          case '&' : which->change_aitype(17); break;
-          case '*' : which->change_aitype(18); break;
-          case '(' : which->change_aitype(19); break;
-        }
-      }  
+      else
+      {
+    switch (ev.key)
+    {
+      case '0' : which->change_aitype(0); break;
+      case '1' : which->change_aitype(1); break;
+      case '2' : which->change_aitype(2); break;
+      case '3' : which->change_aitype(3); break;
+      case '4' : which->change_aitype(4); break;
+      case '5' : which->change_aitype(5); break;
+      case '6' : which->change_aitype(6); break;
+      case '7' : which->change_aitype(7); break;
+      case '8' : which->change_aitype(8); break;
+      case '9' : which->change_aitype(9); break;
+      case ')' : which->change_aitype(10); break;
+      case '!' : which->change_aitype(11); break;
+      case '@' : which->change_aitype(12); break;
+      case '#' : which->change_aitype(13); break;
+      case '$' : which->change_aitype(14); break;
+      case '%' : which->change_aitype(15); break;
+      case '^' : which->change_aitype(16); break;
+      case '&' : which->change_aitype(17); break;
+      case '*' : which->change_aitype(18); break;
+      case '(' : which->change_aitype(19); break;
+    }
+      }
       the_game->need_refresh();
     }
     else the_game->show_help(symbol_str("aitype"));
   }
-
-
 }
 
@@ -1350 +1374 @@
 void dev_controll::toggle_light_window()
 {
-  if (!lightw)
-  {
-    int wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP,bh=16+6,bw=20+6,th=wm->font()->height()+4;    
-    lightw=wm->new_window(prop->getd("light create x",0),
-                          prop->getd("light create y",0),
-                          -1,-1,new button_box(wl,wh,DEV_LIGHT_BUTTON_BOX,1,
-                                    new button(wl+bw*0,wh+bh*0,DEV_LIGHT0,cash.img(light_buttons[0]),
-                                    new button(wl+bw*1,wh+bh*0,DEV_LIGHT1,cash.img(light_buttons[1]),
-                                    new button(wl+bw*2,wh+bh*0,DEV_LIGHT2,cash.img(light_buttons[2]),
-
-                                    new button(wl+bw*0,wh+bh*1,DEV_LIGHT3,cash.img(light_buttons[3]),
-                                    new button(wl+bw*1,wh+bh*1,DEV_LIGHT4,cash.img(light_buttons[4]),
-                                    new button(wl+bw*2,wh+bh*1,DEV_LIGHT5,cash.img(light_buttons[5]),
-
-                                    new button(wl+bw*0,wh+bh*2,DEV_LIGHT6,cash.img(light_buttons[6]),
-                                    new button(wl+bw*1,wh+bh*2,DEV_LIGHT7,cash.img(light_buttons[7]),
-                                    new button(wl+bw*2,wh+bh*2,DEV_LIGHT8,cash.img(light_buttons[8]),
-
-                                    new button(wl+bw*0,wh+bh*3,DEV_LIGHT9,cash.img(light_buttons[9]),
-                                 new button(wl+bw*1,wh+bh*3,DEV_AMBIENT,cash.img(light_buttons[11]),
-                                               NULL))))))))))),
-
-                                    new text_field(wl,wh+bh*4,DEV_LIGHTW,      "W ","******",
-                                                   prop->getd("light create w",0),
-                                    new text_field(wl,wh+bh*4+th*1,DEV_LIGHTH, "H ","******",
-                                                   prop->getd("light create h",0),
-                                    new text_field(wl,wh+bh*4+th*2,DEV_LIGHTR1,"R1","******",
-                                                   prop->getd("light create r1",1),
-                                    new text_field(wl,wh+bh*4+th*3,DEV_LIGHTR2,"R2","******",
-                                                   prop->getd("light create r2",100),
-                                                   NULL))))),
-                                                   symbol_str("l_light"));
-                                                   
-  } else
-  {
-    prop->setd("light create x",lightw->x);
-    prop->setd("light create y",lightw->y);
-    prop->setd("light create w",atoi(lightw->read(DEV_LIGHTW)));
-    prop->setd("light create h",atoi(lightw->read(DEV_LIGHTH)));
-    prop->setd("light create r1",atoi(lightw->read(DEV_LIGHTR1)));
-    prop->setd("light create r2",atoi(lightw->read(DEV_LIGHTR2)));
-    wm->close_window(lightw);
-    lightw=NULL;
-  }
+    if(lightw)
+    {
+        prop->setd("light create x", lightw->x);
+        prop->setd("light create y", lightw->y);
+        prop->setd("light create w", atoi(lightw->read(DEV_LIGHTW)));
+        prop->setd("light create h", atoi(lightw->read(DEV_LIGHTH)));
+        prop->setd("light create r1", atoi(lightw->read(DEV_LIGHTR1)));
+        prop->setd("light create r2", atoi(lightw->read(DEV_LIGHTR2)));
+        wm->close_window(lightw);
+        lightw = NULL;
+        return;
+    }
+
+    int bh = 16 + 6, bw = 20 + 6, th = wm->font()->height() + 4;
+
+    lightw = wm->new_window(prop->getd("light create x", 0),
+                            prop->getd("light create y", 0), -1, -1,
+        new button_box(0, 0, DEV_LIGHT_BUTTON_BOX, 1,
+            new button(bw * 0, bh * 0, DEV_LIGHT0, cash.img(light_buttons[0]),
+            new button(bw * 1, bh * 0, DEV_LIGHT1, cash.img(light_buttons[1]),
+            new button(bw * 2, bh * 0, DEV_LIGHT2, cash.img(light_buttons[2]),
+            new button(bw * 0, bh * 1, DEV_LIGHT3, cash.img(light_buttons[3]),
+            new button(bw * 1, bh * 1, DEV_LIGHT4, cash.img(light_buttons[4]),
+            new button(bw * 2, bh * 1, DEV_LIGHT5, cash.img(light_buttons[5]),
+            new button(bw * 0, bh * 2, DEV_LIGHT6, cash.img(light_buttons[6]),
+            new button(bw * 1, bh * 2, DEV_LIGHT7, cash.img(light_buttons[7]),
+            new button(bw * 2, bh * 2, DEV_LIGHT8, cash.img(light_buttons[8]),
+            new button(bw * 0, bh * 3, DEV_LIGHT9, cash.img(light_buttons[9]),
+            new button(bw * 1, bh * 3, DEV_AMBIENT, cash.img(light_buttons[11]),
+            NULL))))))))))),
+        new text_field(0, bh * 4, DEV_LIGHTW, "W ", "******",
+                       prop->getd("light create w", 0),
+        new text_field(0, bh * 4 + th * 1, DEV_LIGHTH, "H ", "******",
+                       prop->getd("light create h", 0),
+        new text_field(0, bh * 4 + th * 2, DEV_LIGHTR1, "R1", "******",
+                       prop->getd("light create r1", 1),
+        new text_field(0, bh * 4 + th * 3, DEV_LIGHTR2, "R2", "******",
+                       prop->getd("light create r2", 100), NULL))))),
+        symbol_str("l_light"));
 }
 
@@ -1399 +1418 @@
 {
   ai_object=o;
-  int th=wm->font()->height()+4,wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP+20;
+  int th=wm->font()->height()+4,wl = 0, wh = 20;
   if (figures[o->otype]->total_fields)
   {
@@ -1407 +1426 @@
       if( strlen(figures[o->otype]->fields[i]->descript_name) > (unsigned)maxl )
         maxl=strlen(figures[o->otype]->fields[i]->descript_name);
-  
+
     int owh=wh;
     ifield *first=NULL,*last=NULL;
@@ -1415 +1434 @@
       strcpy(tmp,figures[o->otype]->fields[i]->descript_name);
       for (int j=maxl-strlen(figures[o->otype]->fields[i]->descript_name);j;j--)
-        strcat(tmp," ");      
+        strcat(tmp," ");
       int er;
       ifield *p=new text_field(wl,wh,ID_NULL,tmp,"######",
-                               (double)o->get_var_by_name(figures[o->otype]->fields[i]->real_name,er),
-                               NULL);
+                   (double)o->get_var_by_name(figures[o->otype]->fields[i]->real_name,er),
+                   NULL);
       if (last)
         last->next=p;
@@ -1426 +1445 @@
       last=p;
       wh+=th;
-    }         
+    }
     aiw=wm->new_window(prop->getd("ai x",0),
-                       prop->getd("ai y",0),
-                       -1,-1,                
+               prop->getd("ai y",0),
+               -1,-1,
        new button(wl,owh-20,DEV_AI_OK,cash.img(dev_ok),first),"ai");
 
@@ -1436 +1455 @@
   {
     aiw=wm->new_window(prop->getd("ai x",0),
-                       prop->getd("ai y",0),
-                       -1,-1,
+               prop->getd("ai y",0),
+               -1,-1,
        new button(wl,wh-20,DEV_AI_OK,cash.img(dev_ok),
        new text_field(wl,wh+th*0, DEV_AI_XVEL,    symbol_str("ai_xvel"),"#####",(double)o->xvel(),
@@ -1450 +1469 @@
        new text_field(wl,wh+th*9,DEV_AI_STATE,    symbol_str("ai_state"),"####",(double)o->aistate(),
        new text_field(wl,wh+th*10,DEV_AI_FADE,    symbol_str("ai_fade"),"####",(double)o->fade_count(),
-                      NULL)))))))))))),"ai");
+              NULL)))))))))))),"ai");
   }
 
@@ -1468 +1487 @@
     edit_light=NULL;
   }
-  if (l==selected_light)  
+  if (l==selected_light)
     selected_light=NULL;
 }
@@ -1500 +1519 @@
 {
   if (aiw)
-  {    
+  {
     game_object *o=ai_object;
     int32_t x;
@@ -1507 +1526 @@
       if (figures[o->otype]->total_fields)
       {
-        ifield *f=aiw->inm->get(DEV_AI_OK)->next;
-        for (int i=0;i<figures[o->otype]->total_fields;i++)
-        {
-          x=atoi(f->read());
-          char *v=figures[o->otype]->fields[i]->real_name;
-          int er;
-          if (o->get_var_by_name(v,er)!=x)
-          o->set_var_by_name(v,x);
-          f=f->next;
-        }
+    ifield *f=aiw->inm->get(DEV_AI_OK)->next;
+    for (int i=0;i<figures[o->otype]->total_fields;i++)
+    {
+      x=atoi(f->read());
+      char *v=figures[o->otype]->fields[i]->real_name;
+      int er;
+      if (o->get_var_by_name(v,er)!=x)
+      o->set_var_by_name(v,x);
+      f=f->next;
+    }
       }
       else
       {
-        x=atoi(aiw->read(DEV_AI_XVEL)); if (x!=o->xvel()) o->set_xvel(x);
-        x=atoi(aiw->read(DEV_AI_YVEL)); if (x!=o->yvel()) o->set_yvel(x);
-
-        x=atoi(aiw->read(DEV_AI_XACEL)); if (x!=o->xacel()) o->set_xacel(x);
-        x=atoi(aiw->read(DEV_AI_YACEL)); if (x!=o->yacel()) o->set_yacel(x);
-
-        x=atoi(aiw->read(DEV_AI_STTIME)); if (x!=o->aistate_time()) o->set_aistate_time(x);
-        x=atoi(aiw->read(DEV_AI_GRAVITY)); if (x!=o->gravity()) o->set_gravity(x);
-
-        x=atoi(aiw->read(DEV_AI_HEALTH)); if (x!=o->hp()) o->set_hp(x);
-        x=atoi(aiw->read(DEV_AI_MORPHPR)); if (x!=o->mp()) o->set_mp(x);
-
-        x=atoi(aiw->read(DEV_AI_TYPE)); if (x!=o->aitype()) o->set_aitype(x);
-        x=atoi(aiw->read(DEV_AI_STATE)); if (x!=o->aistate()) o->set_aistate(x);
-        x=atoi(aiw->read(DEV_AI_FADE)); if (x!=o->fade_count()) o->set_fade_count(x);
+    x=atoi(aiw->read(DEV_AI_XVEL)); if (x!=o->xvel()) o->set_xvel(x);
+    x=atoi(aiw->read(DEV_AI_YVEL)); if (x!=o->yvel()) o->set_yvel(x);
+
+    x=atoi(aiw->read(DEV_AI_XACEL)); if (x!=o->xacel()) o->set_xacel(x);
+    x=atoi(aiw->read(DEV_AI_YACEL)); if (x!=o->yacel()) o->set_yacel(x);
+
+    x=atoi(aiw->read(DEV_AI_STTIME)); if (x!=o->aistate_time()) o->set_aistate_time(x);
+    x=atoi(aiw->read(DEV_AI_GRAVITY)); if (x!=o->gravity()) o->set_gravity(x);
+
+    x=atoi(aiw->read(DEV_AI_HEALTH)); if (x!=o->hp()) o->set_hp(x);
+    x=atoi(aiw->read(DEV_AI_MORPHPR)); if (x!=o->mp()) o->set_mp(x);
+
+    x=atoi(aiw->read(DEV_AI_TYPE)); if (x!=o->aitype()) o->set_aitype(x);
+    x=atoi(aiw->read(DEV_AI_STATE)); if (x!=o->aistate()) o->set_aistate(x);
+    x=atoi(aiw->read(DEV_AI_FADE)); if (x!=o->fade_count()) o->set_fade_count(x);
       }
     }
@@ -1556 +1575 @@
     if (!current_level) return ;
     current_area=current_level->area_list=new area_controller(gx,gy,
-                                                              the_game->ftile_width(),
-                                                              the_game->ftile_height(),
-                                                              current_level->area_list); 
+                                  the_game->ftile_width(),
+                                  the_game->ftile_height(),
+                                  current_level->area_list);
     the_game->need_refresh();
     state=DEV_DRAG_AREA_BOTTOM;
@@ -1572 +1591 @@
 
     if (current_area && read_values)
-    {      
+    {
       current_area->ambient=atoi(area_win->read(DEV_AREA_AMBIENT));
       current_area->ambient_speed=atoi(area_win->read(DEV_AREA_AMBIENT_SPEED));
@@ -1579 +1598 @@
       current_area->view_xoff_speed=atoi(area_win->read(DEV_AREA_VIEW_XOFF_SPEED));
       current_area->view_yoff_speed=atoi(area_win->read(DEV_AREA_VIEW_YOFF_SPEED));
-    }    
+    }
     wm->close_window(area_win);
     area_win=NULL;
@@ -1600 +1619 @@
       the_game->game_to_mouse(a->x+a->w,a->y+a->h,v,x2,y2);
       if (abs(x1-mx)<2 && abs(y1-my)<2)
-      { find=a; find_top=1; }
+      { find=a;    find_top=1; }
       else if (abs(x2-mx)<2 && abs(y2-my)<2)
-      { find=a; find_top=0; }
-    }  
+      { find=a;    find_top=0; }
+    }
 
     time_marker now;
@@ -1609 +1628 @@
     last_area_click.get_time();
     if (find && current_area && dc)
-    {         
+    {
       if (area_win) close_area_win(0);
-      int wl=WINDOW_FRAME_LEFT;
-      int wh=WINDOW_FRAME_TOP,th=wm->font()->height()+12,bw=cash.img(dev_ok)->width()+10;
+      int wl=0,wh=0,th=wm->font()->height()+12,bw=cash.img(dev_ok)->width()+10;
       area_win=wm->new_window(prop->getd("area_box x",0),
-                              prop->getd("area_box y",0),
-                              -1,-1,
-
-                              new button(wl+bw*0,wh-8,DEV_AREA_OK,cash.img(dev_ok),
-                              new button(wl+bw*1,wh-8,DEV_AREA_DELETE,cash.img(dev_del), 
-
-                              new text_field(wl,wh+th*1,DEV_AREA_AMBIENT,         symbol_str("a_ambient"),"******",current_area->ambient,
+                  prop->getd("area_box y",0),
+                  -1,-1,
+
+                  new button(wl+bw*0,wh-8,DEV_AREA_OK,cash.img(dev_ok),
+                  new button(wl+bw*1,wh-8,DEV_AREA_DELETE,cash.img(dev_del),
+
+                  new text_field(wl,wh+th*1,DEV_AREA_AMBIENT,         symbol_str("a_ambient"),"******",current_area->ambient,
                               new text_field(wl,wh+th*2,DEV_AREA_AMBIENT_SPEED,   symbol_str("a_aspeed"),"******",current_area->ambient_speed,
                               new text_field(wl,wh+th*3,DEV_AREA_VIEW_XOFF,       symbol_str("a_view_xoff"),"******",current_area->view_xoff,
@@ -1626 +1644 @@
                               new text_field(wl,wh+th*5,DEV_AREA_VIEW_XOFF_SPEED, symbol_str("a_view_xspd"),"******",current_area->view_xoff_speed,
                               new text_field(wl,wh+th*6,DEV_AREA_VIEW_YOFF_SPEED, symbol_str("a_view_yspd"),"******",current_area->view_yoff_speed,
-                                             NULL)))))))));
+                         NULL)))))))));
     } else if (find)
     {
@@ -1651 +1669 @@
     prop->setd("oedit y",oedit->y);
     wm->close_window(oedit);
-    oedit=NULL;      
+    oedit=NULL;
     edit_object=NULL;
   }
@@ -1678 +1696 @@
   {
     dlastx=last_demo_mx;
-    dlasty=last_demo_my;    
+    dlasty=last_demo_my;
   }
   if (dev_console && dev_console->handle_event(ev))
@@ -1701 +1719 @@
       sshot_fcount=0;
       the_game->show_help(symbol_str("seqs_on"));
-    }    
+    }
   }
 
@@ -1709 +1727 @@
     {
       if (!ev.mouse_button)
-        state=DEV_SELECT;    
+        state=DEV_SELECT;
     } break;
 
     case DEV_CREATE_OBJECT :
     {
-      if (!ev.mouse_button)    
+      if (!ev.mouse_button)
         state=DEV_MOVE_OBJECT;
     } break;
@@ -1725 +1743 @@
       else
       {
-        if (ev.type==EV_MOUSE_MOVE)
-        {
-          the_game->mouse_to_game(last_demo_mx,last_demo_my,edit_object->x,edit_object->y);      
-          edit_object->x=snap_x(edit_object->x);
-          edit_object->y=snap_y(edit_object->y);
-          the_game->need_refresh();
-        }
-        else if (ev.mouse_button==1 && ev.window==NULL)
-        {
-          state=DEV_MOUSE_RELEASE;
-          selected_object=edit_object=NULL;     
-        }
-        if (ev.window==NULL && ev.type==EV_KEY && ev.key=='d')
-        {
-          int32_t xv=0,yv=100;
-          edit_object->try_move(edit_object->x,edit_object->y,xv,yv,1);
-          edit_object->y+=yv;
-          state=DEV_SELECT;
-          selected_object=edit_object=NULL;     
-        }
-      }
-    } break;
-    
-
-    case DEV_MOVE_LIGHT :    
+    if (ev.type==EV_MOUSE_MOVE)
+    {
+      the_game->mouse_to_game(last_demo_mx,last_demo_my,edit_object->x,edit_object->y);
+      edit_object->x=snap_x(edit_object->x);
+      edit_object->y=snap_y(edit_object->y);
+      the_game->need_refresh();
+    }
+    else if (ev.mouse_button==1 && ev.window==NULL)
+    {
+      state=DEV_MOUSE_RELEASE;
+      selected_object=edit_object=NULL;
+    }
+    if (ev.window==NULL && ev.type==EV_KEY && ev.key=='d')
+    {
+      int32_t xv=0,yv=100;
+      edit_object->try_move(edit_object->x,edit_object->y,xv,yv,1);
+      edit_object->y+=yv;
+      state=DEV_SELECT;
+      selected_object=edit_object=NULL;
+    }
+      }
+    } break;
+
+
+    case DEV_MOVE_LIGHT :
     {
       if (edit_light)
       {
-        if (ev.type==EV_MOUSE_MOVE)
-        {
-          the_game->mouse_to_game(last_demo_mx,last_demo_my,edit_light->x,edit_light->y);
-          edit_light->x=snap_x(edit_light->x);
-          edit_light->y=snap_y(edit_light->y);
-
-          edit_light->calc_range();
-          the_game->need_refresh();
-        } else if (ev.type==EV_KEY)
-        {
-          int rd=0;
-          switch (ev.key)
-          {
-            case '+' :
-            { 
-              if (edit_light->type==9)
-              {
-                if (edit_light->inner_radius<64)
-                { edit_light->inner_radius++; rd=1; }
-              } else { edit_light->outer_radius++; rd=1; }
-            } break;
-            case '-' :
-            {
-              if (edit_light->type==9)
-              {
-                if (edit_light->inner_radius>0)
-                { edit_light->inner_radius--; rd=1; }
-              } else if (edit_light->outer_radius>edit_light->inner_radius+1)
-              { edit_light->outer_radius--; rd=1; }
-            } break;
-            case JK_RIGHT :
-            {
-              if (edit_light->type==9)
-              { edit_light->xshift++; rd=1; }
-              else if (edit_light->xshift>0) 
-              { edit_light->xshift--; rd=1; }
-            } break;
-            case JK_LEFT :
-            {
-              if (edit_light->type==9)
-              {
-                if (edit_light->xshift>1)
-                { edit_light->xshift--; rd=1; }
-              }
-              else
-              { edit_light->xshift++; rd=1; }
-            } break;
-            case JK_UP :
-            {
-              if (edit_light->type==9)
-              { edit_light->yshift++; rd=1; }
-              else if (edit_light->yshift>0) 
-              { edit_light->yshift--; rd=1; }
-            } break;
-            case JK_DOWN :
-            {
-              if (edit_light->type==9)
-              {
-                if (edit_light->yshift>1)
-                { edit_light->yshift--; rd=1; }
-              }
-              else
-              { edit_light->yshift++; rd=1; }
-            } break;
-            
-          }       
-          if (rd)
-          {
-            edit_light->calc_range();
-            the_game->need_refresh();
-          }
-
-        }
+    if (ev.type==EV_MOUSE_MOVE)
+    {
+      the_game->mouse_to_game(last_demo_mx,last_demo_my,edit_light->x,edit_light->y);
+      edit_light->x=snap_x(edit_light->x);
+      edit_light->y=snap_y(edit_light->y);
+
+      edit_light->calc_range();
+      the_game->need_refresh();
+    } else if (ev.type==EV_KEY)
+    {
+      int rd=0;
+      switch (ev.key)
+      {
+        case '+' :
+        {
+          if (edit_light->type==9)
+          {
+        if (edit_light->inner_radius<64)
+        { edit_light->inner_radius++; rd=1; }
+          } else { edit_light->outer_radius++; rd=1; }
+        } break;
+        case '-' :
+        {
+          if (edit_light->type==9)
+          {
+        if (edit_light->inner_radius>0)
+        { edit_light->inner_radius--; rd=1; }
+          } else if (edit_light->outer_radius>edit_light->inner_radius+1)
+          { edit_light->outer_radius--; rd=1; }
+        } break;
+        case JK_RIGHT :
+        {
+          if (edit_light->type==9)
+          { edit_light->xshift++; rd=1; }
+          else if (edit_light->xshift>0)
+          { edit_light->xshift--; rd=1; }
+        } break;
+        case JK_LEFT :
+        {
+          if (edit_light->type==9)
+          {
+        if (edit_light->xshift>1)
+        { edit_light->xshift--; rd=1; }
+          }
+          else
+          { edit_light->xshift++; rd=1; }
+        } break;
+        case JK_UP :
+        {
+          if (edit_light->type==9)
+          { edit_light->yshift++; rd=1; }
+          else if (edit_light->yshift>0)
+          { edit_light->yshift--; rd=1; }
+        } break;
+        case JK_DOWN :
+        {
+          if (edit_light->type==9)
+          {
+        if (edit_light->yshift>1)
+        { edit_light->yshift--; rd=1; }
+          }
+          else
+          { edit_light->yshift++; rd=1; }
+        } break;
+
+      }
+      if (rd)
+      {
+        edit_light->calc_range();
+        the_game->need_refresh();
+      }
+
+    }
       }
 
@@ -1837 +1855 @@
       if (current_area)
       {
-        int32_t gx,gy;
-        the_game->mouse_to_game(last_demo_mx,last_demo_my,gx,gy);
-        if (gx>current_area->x && gy>current_area->y)
-        {       
-          if (gx-current_area->x!=current_area->w || gy-current_area->y!=current_area->h)
-          {
-            the_game->need_refresh();
-            current_area->w=gx-current_area->x;
-            current_area->h=gy-current_area->y;   
-          }
-        }
-        if (ev.type==EV_MOUSE_BUTTON && !ev.mouse_button)
-        {
-          current_area->active=0;
-          state=DEV_SELECT;
-        }
+    int32_t gx,gy;
+    the_game->mouse_to_game(last_demo_mx,last_demo_my,gx,gy);
+    if (gx>current_area->x && gy>current_area->y)
+    {
+      if (gx-current_area->x!=current_area->w || gy-current_area->y!=current_area->h)
+      {
+        the_game->need_refresh();
+        current_area->w=gx-current_area->x;
+        current_area->h=gy-current_area->y;
+      }
+    }
+    if (ev.type==EV_MOUSE_BUTTON && !ev.mouse_button)
+    {
+      current_area->active=0;
+      state=DEV_SELECT;
+    }
       }
     } break;
@@ -1860 +1878 @@
       if (current_area)
       {
-        int32_t gx,gy;
-        the_game->mouse_to_game(last_demo_mx,last_demo_my,gx,gy);
-        if (gx<current_area->x+current_area->w && gy<current_area->y+current_area->h)
-        {       
-          if (gx!=current_area->x || gy!=current_area->y)
-          {
-            the_game->need_refresh();
-            current_area->x=gx;
-            current_area->y=gy;
-          }
-        }
-        if (ev.type==EV_MOUSE_BUTTON && !ev.mouse_button)
-        {
-          current_area->active=0;
-          state=DEV_SELECT;
-        }
+    int32_t gx,gy;
+    the_game->mouse_to_game(last_demo_mx,last_demo_my,gx,gy);
+    if (gx<current_area->x+current_area->w && gy<current_area->y+current_area->h)
+    {
+      if (gx!=current_area->x || gy!=current_area->y)
+      {
+        the_game->need_refresh();
+        current_area->x=gx;
+        current_area->y=gy;
+      }
+    }
+    if (ev.type==EV_MOUSE_BUTTON && !ev.mouse_button)
+    {
+      current_area->active=0;
+      state=DEV_SELECT;
+    }
       }
     } break;
@@ -1883 +1901 @@
       if (dev&EDIT_MODE)
       {
-        game_object *old=selected_object;      
-        selected_object=NULL;
-        if (ev.window==NULL)
-        {       
-          int32_t rx,ry;
-          the_game->mouse_to_game(last_demo_mx,last_demo_my,rx,ry);
-
-          if (!(dev & MAP_MODE))
-          {
-            if (dev&DRAW_PEOPLE_LAYER)
+    game_object *old=selected_object;
+    selected_object=NULL;
+    if (ev.window==NULL)
+    {
+      int32_t rx,ry;
+      the_game->mouse_to_game(last_demo_mx,last_demo_my,rx,ry);
+
+      if (!(dev & MAP_MODE))
+      {
+        if (dev&DRAW_PEOPLE_LAYER)
               selected_object=current_level->find_object(rx,ry);
-            light_source *old_light=selected_light;
-            if (selected_object)
-              selected_light=NULL;
-            else
-              selected_light=find_light(rx,ry);
-            if (selected_light!=old_light)
-              the_game->need_refresh();            
-          } else { selected_light=NULL; }
-
-          if (edit_mode==ID_DMODE_DRAW)
-          {
-            if (ev.mouse_button==1 && !selected_object && !selected_light)
-            {
-              int32_t xs,ys;
-              the_game->ftile_on(last_demo_mx,last_demo_my,xs,ys);
-              if (xs>=0 && ys>=0 && xs<current_level->foreground_width() && 
-                  ys<current_level->foreground_height())              
-              current_level->put_fg(xs,ys,raise_all ? make_above_tile(cur_fg) : cur_fg);
-              the_game->need_refresh();
-            } else if (ev.mouse_button==1 && !selected_object && !selected_light)
-            {
-              int32_t xs,ys;
-              the_game->btile_on(last_demo_mx,last_demo_my,xs,ys);
-              if (xs>=0 && ys>=0 && xs<current_level->background_width() && 
-                  ys<current_level->background_height())
-              current_level->put_bg(xs,ys,cur_fg);
-              the_game->need_refresh();
-            }
-          } else if (edit_mode==ID_DMODE_AREA)
-            area_handle_input(ev);
-          else if (edit_mode==ID_DMODE_PICK)
-            pick_handle_input(ev);                        
-        }
-        
-        if (old!=selected_object)
-        the_game->need_refresh();            
-
-
-        if (ev.mouse_button)
-        {
-          if (selected_object)
-          {
-            if (edit_object && edit_object!=selected_object)      
-              edit_object->add_object(selected_object);
-
-            if (oedit)
-              close_oedit_window();
-             
-            int bw=20+6,bh=16+6,wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP;
-
-            oedit=wm->new_window(prop->getd("oedit x",0),
-                                 prop->getd("oedit y",0),
-                                 -1,-1,new button_box(wl,wh,ID_NULL,1,
-                new button(wl+bw*0,wh,DEV_OEDIT_OK,cash.img(dev_ok),
-                new button(wl+bw*1,wh,DEV_OEDIT_MOVE,cash.img(dev_move),
-                new button(wl+bw*2,wh,DEV_OEDIT_FRONT,cash.img(dev_front),
-                new button(wl+bw*3,wh,DEV_OEDIT_BACK,cash.img(dev_back),
-                new button(wl+bw*4,wh,DEV_OEDIT_COPY,cash.img(dev_copy),
-                new button(wl+bw*0,wh+bh*1,DEV_OEDIT_DELETE,cash.img(dev_del),
-                           NULL)))))),
-               new button(wl+bw*5,wh+bh*0,DEV_OEDIT_AI,cash.img(dev_ai),
-
-               new button_box(wl+bw*1,wh+bh*1,DEV_OEDIT_CHAR_BOX,0,
-               new button(wl+bw*1,wh+bh*1,DEV_OEDIT_LEFT,cash.img(dev_char_left),
-               new button(wl+bw*2,wh+bh*1,DEV_OEDIT_RIGHT,cash.img(dev_char_right),NULL)),
-
-               new button(wl+bw*3,wh+bh*1,DEV_OBJECTS_DELETE,cash.img(dev_objects),
-               new button(wl+bw*4,wh+bh*1,DEV_LIGHTS_DELETE,cash.img(dev_lights),NULL))))),
-                                 symbol_str("l_EDIT"));
-
-            
-            edit_object=selected_object;        
-          } else if (selected_light)
-          {
-            if (ledit)
-            {
-              prop->setd("ledit x",ledit->x);
-              prop->setd("ledit x",ledit->y);
-              wm->close_window(ledit);
-            }
-            int bw=20+6,bh=16+6,wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP,th=wm->font()->height()+4;
-            edit_light=selected_light;
-            if (edit_object)
-            {
-              edit_object->add_light(edit_light);
-              edit_light->known=1;
-            }
-            ledit=wm->new_window(prop->getd("ledit x",0),
-                                 prop->getd("ledit y",0),
-                                 -1,-1,
-                         new button_box(wl,wh,ID_NULL,1,
-                        new button(wl+bw*0,wh,DEV_LEDIT_OK,cash.img(dev_ok),
-                       new button(wl+bw*1,wh,DEV_LEDIT_MOVE,cash.img(dev_move),
-                     new button(wl+bw*2,wh,DEV_LEDIT_COPY,cash.img(dev_copy),
-                    new button(wl+bw*3,wh,DEV_LEDIT_DEL,cash.img(dev_del),NULL)))),
-                    new text_field(wl,wh+bh,DEV_LEDIT_W,      "W ","******",edit_light->xshift,
-                    new text_field(wl,wh+bh+th*1,DEV_LEDIT_H, "H ","******",edit_light->yshift,
-              new text_field(wl,wh+bh+th*2,DEV_LEDIT_R1,"R1","******",(int)(edit_light->inner_radius),
-             new text_field(wl,wh+bh+th*3,DEV_LEDIT_R2,"R2","******",(int)(edit_light->outer_radius),
-                               NULL))))));
-          }
-          else if (ev.window==NULL)
-          {
-            if (dlastx>=0 && dlasty>=0 && edit_mode==ID_DMODE_DRAW)
-            {
-              if ((dev & DRAW_FG_LAYER) && ev.mouse_button==1)
-              { 
-                the_game->ftile_on(last_demo_mx,last_demo_my,x,y);
-                if (x>=0 && y>=0 && x<current_level->foreground_width() &&
-                    y<current_level->foreground_height())
-                the_game->put_fg(x,y,raise_all ? make_above_tile(cur_fg) : cur_fg);
-              }       
-              if ((dev & DRAW_BG_LAYER) && ev.mouse_button==2)
-              {   
-                the_game->btile_on(last_demo_mx,last_demo_my,x,y);
-                if (x>=0 && y>=0 && x<current_level->background_width() &&
-                    y<current_level->background_height())
-                the_game->put_bg(x,y,cur_bg);
-              } 
-            } 
-          }
-        }
+        light_source *old_light=selected_light;
+        if (selected_object)
+          selected_light=NULL;
+        else
+          selected_light=find_light(rx,ry);
+        if (selected_light!=old_light)
+          the_game->need_refresh();
+      } else { selected_light=NULL; }
+
+      if (edit_mode==ID_DMODE_DRAW)
+      {
+        if (ev.mouse_button==1 && !selected_object && !selected_light)
+        {
+          int32_t xs,ys;
+          the_game->ftile_on(last_demo_mx,last_demo_my,xs,ys);
+          if (xs>=0 && ys>=0 && xs<current_level->foreground_width() &&
+          ys<current_level->foreground_height())
+          current_level->put_fg(xs,ys,raise_all ? make_above_tile(cur_fg) : cur_fg);
+          the_game->need_refresh();
+        } else if (ev.mouse_button==1 && !selected_object && !selected_light)
+        {
+          int32_t xs,ys;
+          the_game->btile_on(last_demo_mx,last_demo_my,xs,ys);
+          if (xs>=0 && ys>=0 && xs<current_level->background_width() &&
+          ys<current_level->background_height())
+          current_level->put_bg(xs,ys,cur_fg);
+          the_game->need_refresh();
+        }
+      } else if (edit_mode==ID_DMODE_AREA)
+        area_handle_input(ev);
+      else if (edit_mode==ID_DMODE_PICK)
+        pick_handle_input(ev);
+    }
+
+    if (old!=selected_object)
+        the_game->need_refresh();
+
+
+    if (ev.mouse_button)
+    {
+      if (selected_object)
+      {
+        if (edit_object && edit_object!=selected_object)
+             edit_object->add_object(selected_object);
+
+        if (oedit)
+          close_oedit_window();
+
+        int bw=20+6,bh=16+6;
+
+        oedit=wm->new_window(prop->getd("oedit x",0),
+                 prop->getd("oedit y",0),
+                 -1,-1,new button_box(0,0,ID_NULL,1,
+        new button(bw*0,0,DEV_OEDIT_OK,cash.img(dev_ok),
+        new button(bw*1,0,DEV_OEDIT_MOVE,cash.img(dev_move),
+        new button(bw*2,0,DEV_OEDIT_FRONT,cash.img(dev_front),
+            new button(bw*3,0,DEV_OEDIT_BACK,cash.img(dev_back),
+            new button(bw*4,0,DEV_OEDIT_COPY,cash.img(dev_copy),
+        new button(bw*0,bh*1,DEV_OEDIT_DELETE,cash.img(dev_del),
+               NULL)))))),
+           new button(bw*5,bh*0,DEV_OEDIT_AI,cash.img(dev_ai),
+
+           new button_box(bw*1,bh*1,DEV_OEDIT_CHAR_BOX,0,
+           new button(bw*1,bh*1,DEV_OEDIT_LEFT,cash.img(dev_char_left),
+           new button(bw*2,bh*1,DEV_OEDIT_RIGHT,cash.img(dev_char_right),NULL)),
+
+           new button(bw*3,bh*1,DEV_OBJECTS_DELETE,cash.img(dev_objects),
+           new button(bw*4,bh*1,DEV_LIGHTS_DELETE,cash.img(dev_lights),NULL))))),
+                 symbol_str("l_EDIT"));
+
+
+        edit_object=selected_object;
+      } else if (selected_light)
+      {
+        if (ledit)
+        {
+          prop->setd("ledit x",ledit->x);
+          prop->setd("ledit x",ledit->y);
+          wm->close_window(ledit);
+        }
+        int bw=20+6,bh=16+6,th=wm->font()->height()+4;
+        edit_light=selected_light;
+        if (edit_object)
+        {
+          edit_object->add_light(edit_light);
+          edit_light->known=1;
+        }
+        ledit=wm->new_window(prop->getd("ledit x",0),
+                 prop->getd("ledit y",0),
+                 -1,-1,
+              new button_box(0,0,ID_NULL,1,
+                   new button(bw*0,0,DEV_LEDIT_OK,cash.img(dev_ok),
+               new button(bw*1,0,DEV_LEDIT_MOVE,cash.img(dev_move),
+                  new button(bw*2,0,DEV_LEDIT_COPY,cash.img(dev_copy),
+            new button(bw*3,0,DEV_LEDIT_DEL,cash.img(dev_del),NULL)))),
+            new text_field(0,bh,DEV_LEDIT_W,      "W ","******",edit_light->xshift,
+            new text_field(0,bh+th*1,DEV_LEDIT_H, "H ","******",edit_light->yshift,
+          new text_field(0,bh+th*2,DEV_LEDIT_R1,"R1","******",(int)(edit_light->inner_radius),
+         new text_field(0,bh+th*3,DEV_LEDIT_R2,"R2","******",(int)(edit_light->outer_radius),
+                   NULL))))));
+      }
+      else if (ev.window==NULL)
+      {
+        if (dlastx>=0 && dlasty>=0 && edit_mode==ID_DMODE_DRAW)
+        {
+          if ((dev & DRAW_FG_LAYER) && ev.mouse_button==1)
+          {
+        the_game->ftile_on(last_demo_mx,last_demo_my,x,y);
+        if (x>=0 && y>=0 && x<current_level->foreground_width() &&
+            y<current_level->foreground_height())
+        the_game->put_fg(x,y,raise_all ? make_above_tile(cur_fg) : cur_fg);
+          }
+          if ((dev & DRAW_BG_LAYER) && ev.mouse_button==2)
+          {
+        the_game->btile_on(last_demo_mx,last_demo_my,x,y);
+        if (x>=0 && y>=0 && x<current_level->background_width() &&
+            y<current_level->background_height())
+        the_game->put_bg(x,y,cur_bg);
+          }
+        }
+      }
+    }
       }
     }
@@ -2027 +2045 @@
     {
       switch (ev.message.id)
-      { 
-        case ID_DMODE_DRAW :
-        case ID_DMODE_PICK :
-        case ID_DMODE_FILL :
-        case ID_DMODE_LINE : 
-        case ID_DMODE_RECT :
-        case ID_DMODE_BAR  : 
-        case ID_DMODE_AREA :
-        {
-          edit_mode=ev.message.id;
-        } break;
-/*      case ID_ENLARGE_RENDER :
-        {
-          if (!small_render)
-            double_render();
-          else    
-            single_render();
-          
-          view_shift_disabled=!view_shift_disabled;
-        } break; */
-
-        case ID_SEARCH :
-        {
-          toggle_search_window();
-        } break;
-        case ID_SEARCH_FOREWARD :
-        { search_forward();
-        } break;
-        case ID_SEARCH_BACKWARD :
-        { search_forward();
-        } break;
-        case ID_CANCEL :
-        {
-          if (mess_win)
-          {
-            wm->close_window(mess_win);
-            mess_win=NULL;
-          } break;
-        } break;
-        case ID_LEVEL_LOAD :
-        {       
-          if (!mess_win)
-          {
-            mess_win=file_dialog(symbol_str("level_name"),current_level ? current_level->name() : "",
-                                 ID_LEVEL_LOAD_OK,symbol_str("ok_button"),ID_CANCEL,symbol_str("cancel_button"),
-                                 symbol_str("FILENAME"),ID_MESS_STR1);
-            wm->grab_focus(mess_win);
-          }
-        } break;
-        case ID_LEVEL_LOAD_OK :
-        {
-          char cmd[100];
-          sprintf(cmd,"load %s",mess_win->read(ID_MESS_STR1));
-          dev_cont->do_command(cmd,ev);
-          wm->push_event(new event(ID_CANCEL,NULL));        // close window
-        } break;        
-        case ID_GAME_SAVE :
-        {
-          current_level->save("savegame.spe",1);
-          the_game->show_help(symbol_str("saved_game"));
-          the_game->need_refresh();       
-        } break;
-        case ID_LEVEL_SAVE :
-        { if (current_level)
-          {
-            if (current_level->save(current_level->name(),0))
-            {
-              char msg[100];
-              sprintf(msg,symbol_str("saved_level"),current_level->name());
-              the_game->show_help(msg);
-              the_game->need_refresh();
-            }
-          }
-          else the_game->show_help("no current level, cannot save");
-        } break;
-        case ID_LEVEL_SAVEAS :
-        {
-          if (!mess_win)
-          {
-            mess_win=file_dialog(symbol_str("saveas_name"),current_level ? current_level->name() : "untitled.spe",
-                               ID_LEVEL_SAVEAS_OK,symbol_str("ok_button"),
-                                 ID_CANCEL,symbol_str("cancel_button"),
-                                 symbol_str("FILENAME"),ID_MESS_STR1);
-            wm->grab_focus(mess_win);
-          }
-        } break;
-        case ID_LEVEL_SAVEAS_OK :
-        {
-          if (current_level)
-          {
-            current_level->set_name(mess_win->read(ID_MESS_STR1));
-            wm->push_event(new event(ID_CANCEL,NULL));        // close window after save
-            wm->push_event(new event(ID_LEVEL_SAVE,NULL));          
-          }
-        } break;
-        case ID_EDIT_SAVE :
-        {
-          do_command("esave",ev);
-          the_game->show_help(symbol_str("edit_saved"));
-        } break;
-        case ID_CACHE_PROFILE :
-        {
-          if (current_level && !cash.prof_is_on())
-          {
-            cash.prof_init();
-            the_game->show_help("Cache profiling is now on.");
-          }
-          else the_game->show_help("Cache profiling is already on!");
-        } break;
-
-        case ID_CACHE_PROFILE_END :  // ask the user for a file name to save as
-        {
-          if (cash.prof_is_on())
-          {
-            cash.prof_uninit();
-            the_game->show_help(symbol_str("prof_off"));
-          } else the_game->show_help(symbol_str("prof"));
-        } break;
-
-        case ID_LEVEL_NEW :
-        {
-          if (!mess_win)
-          {
-            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
-                       new button(WINDOW_FRAME_LEFT+10,WINDOW_FRAME_TOP+20,ID_LEVEL_NEW_OK,symbol_str("YES"),
-                       new button(WINDOW_FRAME_LEFT+40,WINDOW_FRAME_TOP+20,ID_CANCEL,symbol_str("NO"),
-              new info_field(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,ID_NULL,symbol_str("sure?"),NULL))),symbol_str("New?"));
-            wm->grab_focus(mess_win);
-          }
-        } break;
-        case ID_LEVEL_NEW_OK :
-        {
-          wm->push_event(new event(ID_CANCEL,NULL));  // close_window
-          if (current_level)      
-            delete current_level;        
-          current_level=new level(100,100,"untitled.spe");
-        } break;
-        case ID_LEVEL_RESIZE :
-        {
-          if (!mess_win)
-          {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
-            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
-                    new text_field(wl,wt+h*0,ID_MESS_STR1,symbol_str("width_"),"****",
-                               current_level ? current_level->foreground_width() : 100,
-                    new text_field(wl,wt+h*1,ID_MESS_STR2,symbol_str("height_"),"****",
-                               current_level ? current_level->foreground_height() : 100,
-                                   new button(wl+10,wt+h*4,ID_LEVEL_RESIZE_OK,symbol_str("ok_button"),
-                                   new button(wt+40,wt+h*4,ID_CANCEL,symbol_str("cancel_button"),NULL)))),symbol_str("_scroll"));
-          } 
-        } break;
-        case ID_LEVEL_RESIZE_OK :
-        {
-          if (current_level)
-          {
-            current_level->set_size(atoi(mess_win->read(ID_MESS_STR1)),
-                                    atoi(mess_win->read(ID_MESS_STR2)));
-          } else the_game->show_help("Create a level first!");
-          wm->push_event(new event(ID_CANCEL,NULL));  // close_window
-        } break;
-
-        case ID_SUSPEND :
-        {
-          dev^=SUSPEND_MODE;
-          if (dev&SUSPEND_MODE)
-            the_game->show_help(symbol_str("suspend_on"));
-          else
-             the_game->show_help(symbol_str("suspend_off"));
-        } break;
-        case ID_PLAY_MODE :
-        {
-          dev^=EDIT_MODE;
-        } break;
-        case ID_QUIT :
-        {
-          if (confirm_quit())
-            do_command("quit",ev);
-        } ;
-        case ID_TOGGLE_MAP :
-        {
-          if (dev&MAP_MODE) dev-=MAP_MODE;
-          else dev|=MAP_MODE;
-          the_game->need_refresh();      
-        } break;
-        case ID_TOGGLE_LIGHT :
-        {
-          dev^=DRAW_LIGHTS;
-          the_game->need_refresh();
-        } break;
-        case ID_RECORD_DEMO :
-        {
-          if (!mess_win)
-          {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
-            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
-                    new text_field(wl,wt+h*0,ID_RECORD_DEMO_FILENAME,
-                                   "demo filename","*******************",
-                                   "demo.dat",
-                                   new button(wl+10,wt+h*2,ID_RECORD_DEMO_OK,symbol_str("ok_button"),
-                                   new button(wt+40,wt+h*2,ID_CANCEL,symbol_str("cancel_button"),NULL))));
-          }
-        } break;
+      {
+    case ID_DMODE_DRAW :
+    case ID_DMODE_PICK :
+    case ID_DMODE_FILL :
+    case ID_DMODE_LINE :
+    case ID_DMODE_RECT :
+    case ID_DMODE_BAR  :
+    case ID_DMODE_AREA :
+    {
+      edit_mode=ev.message.id;
+    } break;
+/*    case ID_ENLARGE_RENDER :
+    {
+      if (!small_render)
+        double_render();
+      else
+        single_render();
+
+      view_shift_disabled=!view_shift_disabled;
+    } break; */
+
+    case ID_SEARCH :
+    {
+      toggle_search_window();
+    } break;
+    case ID_SEARCH_FOREWARD :
+    { search_forward();
+    } break;
+    case ID_SEARCH_BACKWARD :
+    { search_forward();
+    } break;
+    case ID_CANCEL :
+    {
+      if (mess_win)
+      {
+        wm->close_window(mess_win);
+        mess_win=NULL;
+      } break;
+    } break;
+    case ID_LEVEL_LOAD :
+    {
+      if (!mess_win)
+      {
+        mess_win=file_dialog(symbol_str("level_name"),current_level ? current_level->name() : "",
+                 ID_LEVEL_LOAD_OK,symbol_str("ok_button"),ID_CANCEL,symbol_str("cancel_button"),
+                 symbol_str("FILENAME"),ID_MESS_STR1);
+        wm->grab_focus(mess_win);
+      }
+    } break;
+    case ID_LEVEL_LOAD_OK :
+    {
+      char cmd[100];
+      sprintf(cmd,"load %s",mess_win->read(ID_MESS_STR1));
+      dev_cont->do_command(cmd,ev);
+      wm->push_event(new event(ID_CANCEL,NULL));        // close window
+    } break;
+    case ID_GAME_SAVE :
+    {
+      current_level->save("savegame.spe",1);
+      the_game->show_help(symbol_str("saved_game"));
+      the_game->need_refresh();
+    } break;
+    case ID_LEVEL_SAVE :
+    { if (current_level)
+      {
+        if (current_level->save(current_level->name(),0))
+        {
+          char msg[100];
+          sprintf(msg,symbol_str("saved_level"),current_level->name());
+          the_game->show_help(msg);
+          the_game->need_refresh();
+        }
+      }
+      else the_game->show_help("no current level, cannot save");
+    } break;
+    case ID_LEVEL_SAVEAS :
+    {
+      if (!mess_win)
+      {
+        mess_win=file_dialog(symbol_str("saveas_name"),current_level ? current_level->name() : "untitled.spe",
+                   ID_LEVEL_SAVEAS_OK,symbol_str("ok_button"),
+                 ID_CANCEL,symbol_str("cancel_button"),
+                 symbol_str("FILENAME"),ID_MESS_STR1);
+        wm->grab_focus(mess_win);
+      }
+    } break;
+    case ID_LEVEL_SAVEAS_OK :
+    {
+      if (current_level)
+      {
+        current_level->set_name(mess_win->read(ID_MESS_STR1));
+        wm->push_event(new event(ID_CANCEL,NULL));        // close window after save
+        wm->push_event(new event(ID_LEVEL_SAVE,NULL));
+      }
+    } break;
+    case ID_EDIT_SAVE :
+    {
+      do_command("esave",ev);
+      the_game->show_help(symbol_str("edit_saved"));
+    } break;
+    case ID_CACHE_PROFILE :
+    {
+      if (current_level && !cash.prof_is_on())
+      {
+        cash.prof_init();
+        the_game->show_help("Cache profiling is now on.");
+      }
+      else the_game->show_help("Cache profiling is already on!");
+    } break;
+
+    case ID_CACHE_PROFILE_END :  // ask the user for a file name to save as
+    {
+      if (cash.prof_is_on())
+      {
+        cash.prof_uninit();
+        the_game->show_help(symbol_str("prof_off"));
+      } else the_game->show_help(symbol_str("prof"));
+    } break;
+
+    case ID_LEVEL_NEW :
+    {
+      if (!mess_win)
+      {
+        mess_win=wm->new_window(xres/2,yres/2,-1,-1,
+               new button(10,20,ID_LEVEL_NEW_OK,symbol_str("YES"),
+                        new button(40,20,ID_CANCEL,symbol_str("NO"),
+          new info_field(0,0,ID_NULL,symbol_str("sure?"),NULL))),symbol_str("New?"));
+        wm->grab_focus(mess_win);
+      }
+    } break;
+    case ID_LEVEL_NEW_OK :
+    {
+      wm->push_event(new event(ID_CANCEL,NULL));  // close_window
+      if (current_level)
+        delete current_level;
+      current_level=new level(100,100,"untitled.spe");
+    } break;
+    case ID_LEVEL_RESIZE :
+    {
+      if (!mess_win)
+      {
+        int h=wm->font()->height()+8;
+        mess_win=wm->new_window(xres/2,yres/2,-1,-1,
+            new text_field(0,h*0,ID_MESS_STR1,symbol_str("width_"),"****",
+                   current_level ? current_level->foreground_width() : 100,
+            new text_field(0,h*1,ID_MESS_STR2,symbol_str("height_"),"****",
+                   current_level ? current_level->foreground_height() : 100,
+                   new button(10,h*4,ID_LEVEL_RESIZE_OK,symbol_str("ok_button"),
+                   new button(40,h*4,ID_CANCEL,symbol_str("cancel_button"),NULL)))),symbol_str("_scroll"));
+      }
+    } break;
+    case ID_LEVEL_RESIZE_OK :
+    {
+      if (current_level)
+      {
+        current_level->set_size(atoi(mess_win->read(ID_MESS_STR1)),
+                    atoi(mess_win->read(ID_MESS_STR2)));
+      } else the_game->show_help("Create a level first!");
+      wm->push_event(new event(ID_CANCEL,NULL));  // close_window
+    } break;
+
+    case ID_SUSPEND :
+    {
+      dev^=SUSPEND_MODE;
+      if (dev&SUSPEND_MODE)
+        the_game->show_help(symbol_str("suspend_on"));
+      else
+         the_game->show_help(symbol_str("suspend_off"));
+    } break;
+    case ID_PLAY_MODE :
+    {
+      dev^=EDIT_MODE;
+    } break;
+    case ID_QUIT :
+    {
+      if (confirm_quit())
+        do_command("quit",ev);
+    } ;
+    case ID_TOGGLE_MAP :
+    {
+      if (dev&MAP_MODE) dev-=MAP_MODE;
+      else dev|=MAP_MODE;
+      the_game->need_refresh();
+    } break;
+    case ID_TOGGLE_LIGHT :
+    {
+      dev^=DRAW_LIGHTS;
+      the_game->need_refresh();
+    } break;
+    case ID_RECORD_DEMO :
+    {
+      if (!mess_win)
+      {
+        int h=wm->font()->height()+8;
+        mess_win=wm->new_window(xres/2,yres/2,-1,-1,
+            new text_field(0,h*0,ID_RECORD_DEMO_FILENAME,
+                   "demo filename","*******************",
+                   "demo.dat",
+                   new button(10,h*2,ID_RECORD_DEMO_OK,symbol_str("ok_button"),
+                   new button(40,h*2,ID_CANCEL,symbol_str("cancel_button"),NULL))));
+      }
+    } break;
 
         case ID_RECORD_DEMO_OK :
-        {
-          demo_man.set_state(demo_manager::RECORDING,mess_win->read(ID_RECORD_DEMO_FILENAME));
-          wm->push_event(new event(ID_CANCEL,NULL));        // close window       
-        } break;
-
-        case ID_PLAY_DEMO :
-        {
-          if (!mess_win)
-          {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
-            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
-                    new text_field(wl,wt+h*0,ID_PLAY_DEMO_FILENAME,
-                                   "demo filename","*******************",
-                                   "demo.dat",
-                                   new button(wl+10,wt+h*2,ID_PLAY_DEMO_OK,symbol_str("ok_button"),
-                                   new button(wt+40,wt+h*2,ID_CANCEL,symbol_str("cancel_button"),NULL))));
-          }
-        } break;
+    {
+      demo_man.set_state(demo_manager::RECORDING,mess_win->read(ID_RECORD_DEMO_FILENAME));
+      wm->push_event(new event(ID_CANCEL,NULL));        // close window
+    } break;
+
+    case ID_PLAY_DEMO :
+    {
+      if (!mess_win)
+      {
+        int h=wm->font()->height()+8;
+        mess_win=wm->new_window(xres/2,yres/2,-1,-1,
+            new text_field(0,h*0,ID_PLAY_DEMO_FILENAME,
+                   "demo filename","*******************",
+                   "demo.dat",
+                   new button(10,h*2,ID_PLAY_DEMO_OK,symbol_str("ok_button"),
+                   new button(40,h*2,ID_CANCEL,symbol_str("cancel_button"),NULL))));
+      }
+    } break;
 
         case ID_PLAY_DEMO_OK :
-        {
-          demo_man.set_state(demo_manager::PLAYING,mess_win->read(ID_PLAY_DEMO_FILENAME));
-          wm->close_window(mess_win);
-          mess_win=NULL;
-        } break; 
-
-        case ID_SET_SCROLL :
-        {
-          if (!mess_win)
-          {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
-            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
-                    new text_field(wl,wt+h*0,ID_MESS_STR1,symbol_str("x_mul"),"****",bg_xmul,
-                    new text_field(wl,wt+h*1,ID_MESS_STR2,symbol_str("x_div"),"****",bg_xdiv,
-                    new text_field(wl,wt+h*2,ID_MESS_STR3,symbol_str("y_mul"),"****",bg_ymul,
-                    new text_field(wl,wt+h*3,ID_MESS_STR4,symbol_str("y_div"),"****",bg_ydiv,
-                                   new button(wl+10,wt+h*4,ID_SET_SCROLL_CHECK,symbol_str("ok_button"),
-                                   new button(wt+40,wt+h*4,ID_CANCEL,symbol_str("cancel_button"),NULL)))))),symbol_str("_scroll"));
-          } 
-        } break;
-        case ID_SET_SCROLL_CHECK :
-        {
-          int tbg_xmul=atoi(mess_win->read(ID_MESS_STR1));
-          int tbg_xdiv=atoi(mess_win->read(ID_MESS_STR2));
-          int tbg_ymul=atoi(mess_win->read(ID_MESS_STR3));
-          int tbg_ydiv=atoi(mess_win->read(ID_MESS_STR4));
-
-          if ( (((float)tbg_xmul/(float)tbg_xdiv) < ((float)bg_xmul/(float)bg_xdiv)) ||
-              (((float)tbg_ymul/(float)tbg_ydiv) < ((float)bg_ymul/(float)bg_ydiv)))
-          {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
-
-            warn_win=wm->new_window(xres/2-40,yres/2-40,-1,-1,
-                              new info_field(wl,wt,ID_NULL,
-                                          symbol_str("back_loss"),
-                                          new button(wl+10,wt+h*4,ID_SET_SCROLL_OK,symbol_str("ok_button"),
-                                          new button(wt+40,wt+h*4,ID_WARN_CANCEL,symbol_str("cancel_button"),NULL))),
-                                    symbol_str("WARNING"));
-            wm->grab_focus(warn_win);
-          } else wm->push_event(new event(ID_SET_SCROLL_OK,NULL));
-        } break;
-        case ID_WARN_CANCEL :
-        {
-          wm->close_window(warn_win); warn_win=NULL;
-          wm->push_event(new event(ID_CANCEL,NULL));
-        } break;
-        case ID_SET_SCROLL_OK :
-        {
-          if (warn_win) { wm->close_window(warn_win); warn_win=NULL; }
-          bg_xmul=atoi(mess_win->read(ID_MESS_STR1));
-          bg_xdiv=atoi(mess_win->read(ID_MESS_STR2));
-          bg_ymul=atoi(mess_win->read(ID_MESS_STR3));
-          bg_ydiv=atoi(mess_win->read(ID_MESS_STR4));
-          wm->push_event(new event(ID_CANCEL,NULL));        // close window
-        } break;
-
-        case ID_CENTER_PLAYER :
-        {
-           do_command("center",ev); break;
-        } break;
-
-        case ID_INTERPOLATE_DRAW :  
-        {
-          interpolate_draw=!interpolate_draw;
-        } break;
-
-        case ID_DISABLE_AUTOLIGHT : 
-        {
-          disable_autolight=!disable_autolight;
-        } break;
-
-        case ID_ADD_PALETTE :
-        {
-          if (!mess_win)
-          {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
-            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
-                    new text_field(wl,wt+h*0,ID_MESS_STR1,symbol_str("ap_width"),"****",2,
-                    new text_field(wl,wt+h*1,ID_MESS_STR2,symbol_str("ap_height"),"****",2,
-                    new text_field(wl,wt+h*2,ID_MESS_STR3,symbol_str("ap_name"),"***********","pal",
-                                   new button(wl+10,wt+h*3,ID_ADD_PALETTE_OK,symbol_str("ok_button"),
-                                   new button(wt+40,wt+h*3,ID_CANCEL,symbol_str("cancel_button"),NULL))))),symbol_str("ap_pal"));
-          } 
-        } break;
-        case ID_ADD_PALETTE_OK :
-        {
-          char name[70];
-          sprintf(name,"(add_palette \"%s\" %d %d)",mess_win->read(ID_MESS_STR3),
-                  atoi(mess_win->read(ID_MESS_STR1)),
-                  atoi(mess_win->read(ID_MESS_STR2)));
-          char const *s=name;
-          eval(compile(s));
-          wm->push_event(new event(ID_CANCEL,NULL));        // close window
-        } break;
-        case ID_TOGGLE_DELAY :
-        {
-          the_game->toggle_delay(); break;
-        } break;
-
-        case ID_SMALL_MODE :
-        {
-          make_screen_size(311,160); break;
-        } break;
-        case ID_CLEAR_WEAPONS :
-        {
-          event ev;
-          do_command("clear_weapons",ev); 
-        } break;
-        case ID_GOD_MODE :
-        {
-          for (view *v=player_list;v;v=v->next)
-            v->god=!v->god;
-        } break;
-        case ID_MOUSE_SCROLL :
-        {
-          mouse_scrolling=!mouse_scrolling;
-          prop->setd("mouse_scrolling",mouse_scrolling);
-          if (mouse_scrolling)
-            the_game->show_help(symbol_str("ms_on"));
-          else
-            the_game->show_help(symbol_str("ms_off"));
-        } break;
-
-        case ID_LOCK_PALETTES :
-        {
-          palettes_locked=!palettes_locked;
-          prop->setd("palettes_locked",palettes_locked);
-          if (palettes_locked)
-            the_game->show_help(symbol_str("pal_lock"));
-          else the_game->show_help(symbol_str("pal_unlock"));     
-        } break;
-
-        case ID_DISABLE_VIEW_SHIFT :
-        {
-          view_shift_disabled=!view_shift_disabled;
-          prop->setd("view_shift_disabled",view_shift_disabled);
-          if (view_shift_disabled)
-            the_game->show_help(symbol_str("vs_dis"));
-          else the_game->show_help(symbol_str("vs_en"));          
-        } break; 
-
-        case ID_WIN_FORE :
-        { 
-          toggle_fgw();
-        } break;
-        case ID_WIN_BACK :
-        { 
-          toggle_bgw();
-        } break;
-        case ID_WIN_OBJECTS :
-        { 
-          toggle_omenu();
-        } break;
-        case ID_WIN_PALETTES :
-        { 
-          toggle_pmenu();
-        } break;
-        case ID_WIN_LIGHTING :
-        { 
-          toggle_light_window();
-        } break;
-        case ID_WIN_LAYERS :
-        {
-          toggle_show_menu(); 
-        } break;
-        case ID_WIN_CONSOLE :
-        {
-          if (dev_console) dev_console->toggle();
-        } break;
-        case ID_WIN_TOOLBAR :
-        {
-          toggle_toolbar();
-        } break;
-
-        case DEV_AMBIENT :
-        { if (!ambw) make_ambient(); } break;
-        case DEV_AREA_OK :
-        { close_area_win(1); } break;
-        case DEV_AREA_DELETE :
-        { close_area_win(0);
-          if (current_area && current_level)
-          {
-            if (current_level->area_list==current_area)
-              current_level->area_list=current_level->area_list->next;
-            else
-            {
-              area_controller *a=current_level->area_list,*l=NULL;
-              for (;a!=current_area && a;a=a->next) { l=a; }
-              l->next=a->next;
-              delete a;
-            }
-            current_area=NULL;
-            the_game->need_refresh();
-          }
-        } break;
-        case DEV_AI_OK :
-          close_ai_window(); break;
-        case DEV_OEDIT_AI :
-          make_ai_window(edit_object); break;
-        case DEV_OBJECTS_DELETE :
-        {
-          if (edit_object)
-          {
-            for (int i=0;i<edit_object->total_objects();i++)
-              edit_object->remove_object(edit_object->get_object(0));
-            the_game->need_refresh();       
-          }
-        } break;
-
-        case DEV_LIGHTS_DELETE :
-        {
-          if (edit_object)
-          {
-            for (int i=0;i<edit_object->total_lights();i++)
-              edit_object->remove_light(edit_object->get_light(0));
-            the_game->need_refresh();       
-          }
-        } break;
-
-        case DEV_LEDIT_DEL :
-        {
-          prop->setd("ledit x",ledit->x);
-          prop->setd("ledit y",ledit->y);
-          wm->close_window(ledit); ledit=NULL;
-          if (current_level)
-            current_level->remove_light(edit_light);
-          else
-            delete_light(edit_light);
-          edit_light=NULL;
-          the_game->need_refresh();
-        } break;
-        case DEV_LEDIT_OK :
-        {
-          edit_light->xshift=atoi(ledit->read(DEV_LEDIT_W));
-          edit_light->yshift=atoi(ledit->read(DEV_LEDIT_H));
-          edit_light->inner_radius=atoi(ledit->read(DEV_LEDIT_R1));
-          edit_light->outer_radius=atoi(ledit->read(DEV_LEDIT_R2));
-          if (edit_light->outer_radius<=edit_light->inner_radius)
-          {
-            edit_light->inner_radius=edit_light->outer_radius-1;
-            if (edit_light->inner_radius<1)
-            {
-              edit_light->inner_radius=1;
-              edit_light->outer_radius=2;
-            }
-          }
-
-          edit_light->calc_range();
-          edit_light=NULL;
-          prop->setd("ledit x",ledit->x);
-          prop->setd("ledit y",ledit->y);
-          wm->close_window(ledit); ledit=NULL;
-          the_game->need_refresh();       
-        } break;
-        case DEV_LEDIT_MOVE :
-        {
-          prop->setd("ledit x",ledit->x);
-          prop->setd("ledit y",ledit->y);
-          wm->close_window(ledit); ledit=NULL;
-          state=DEV_MOVE_LIGHT;
-        } break;
-        case DEV_LEDIT_COPY :
-        {
-          edit_light=edit_light->copy();
-          prop->setd("ledit x",ledit->x);
-          prop->setd("ledit y",ledit->y);
-          wm->close_window(ledit); ledit=NULL;    
-          state=DEV_MOVE_LIGHT;
-        } break;
-
-
-        case DEV_LIGHT0 :
-        case DEV_LIGHT1 :
-        case DEV_LIGHT2 :
-        case DEV_LIGHT3 :
-        case DEV_LIGHT4 :
-        case DEV_LIGHT5 :
-        case DEV_LIGHT6 :
-        case DEV_LIGHT7 :
-        case DEV_LIGHT8 :
-        case DEV_LIGHT9 :
-        {
-          int32_t lx,ly;
-          the_game->mouse_to_game(last_demo_mx,last_demo_my,lx,ly);
-          lx=snap_x(lx);
-          ly=snap_y(ly);
-          edit_light=add_light_source(ev.message.id-DEV_LIGHT0,lx,ly,
-                                       atoi(lightw->read(DEV_LIGHTR1)),
-                                       atoi(lightw->read(DEV_LIGHTR2)),
-                                       atoi(lightw->read(DEV_LIGHTW)),
-                                       atoi(lightw->read(DEV_LIGHTH)));
-          state=DEV_MOVE_LIGHT;                                
-        } break;
-        case ID_RAISE_ALL :
-        {
-          raise_all=!raise_all;
-          prop->setd("raise_all",raise_all);
-          if (raise_all)
-            the_game->show_help(symbol_str("fg_r"));
-          else
-            the_game->show_help(symbol_str("fg_l"));
-        } break;
-        case DEV_OEDIT_COPY :
-        {
-          game_object *use=copy_object;
-          if (!use) use=edit_object;
-          if (use)
-          {         
-            game_object *old=use;
-            close_oedit_window();
-            if (use->controller())
-              the_game->show_help(symbol_str("no_clone"));
-            else
-            {
-              edit_object=old->copy();
-
-              current_level->add_object(edit_object);
-              the_game->need_refresh();
-              state=DEV_MOVE_OBJECT; 
-
-              close_oedit_window();
-              copy_object=NULL;
-            }
-          }
-        } break;
-        case DEV_OEDIT_LEFT :
-        {
-          if (edit_object)
-          {
-            the_game->need_refresh();
-            edit_object->direction=-1;
-          }
-        } break;
-        case DEV_OEDIT_RIGHT :
-        {
-          if (edit_object)
-          {
-            the_game->need_refresh();
-            edit_object->direction=1;
-          }
-        } break;
-
-
-        case DEV_COMMAND_OK :
-        {
-          char cmd[100];
-          strcpy(cmd,commandw->inm->get(DEV_COMMAND)->read());      
-          prop->setd("commandw x",commandw->x);
-          prop->setd("commandw y",commandw->y);
-          wm->close_window(commandw); 
-          commandw=NULL;
-          do_command(cmd,ev);
-        } break;
-
-        case ID_SHOW_FPS :
-        { fps_on=!fps_on; } break;
-        case ID_PROFILE :
-        { profile_toggle(); 
-          profile_on=!profile_on; 
-        } break;
-          
-        case ID_TOGGLE_NAMES : { show_names=!show_names; } break;
-        case DEV_QUIT : the_game->end_session(); break;
-        case DEV_EDIT_FG : dev=1; break; //the_game->draw(); break;
-        case DEV_EDIT_BG : dev=2; break; //the_game->draw(); break;
-        case DEV_EDIT_FGBG : dev=3; break; //the_game->draw(); break;
-        case DEV_PLAY : dev=0; break; //the_game->draw(); break;
-        case SHOW_FOREGROUND :
-        { dev=dev^DRAW_FG_LAYER; the_game->need_refresh(); } break;
-        case SHOW_FOREGROUND_BOUND :
-        { dev=dev^DRAW_FG_BOUND_LAYER; the_game->need_refresh(); } break;
-        case SHOW_BACKGROUND :
-        { dev=dev^DRAW_BG_LAYER; the_game->need_refresh(); } break;
-        case SHOW_CHARACTERS :
-        { dev=dev^DRAW_PEOPLE_LAYER; the_game->need_refresh(); } break;
-        case SHOW_LIGHT :
-        { dev=dev^DRAW_LIGHTS; the_game->need_refresh(); } break;               
-        case SHOW_LINKS :
-        { dev=dev^DRAW_LINKS;  the_game->need_refresh(); } break;
-          
-
-        case DEV_CREATE : 
-        {         
-          int val=get_omenu_item(((pick_list *)ev.message.data)->get_selection());
-          char cmd[100];
-          sprintf(cmd,"create %s",object_names[val]);
-          do_command(cmd,ev);
-          state=DEV_CREATE_OBJECT;
-          dev|=(EDIT_MODE | DRAW_PEOPLE_LAYER);     
-        }             
-        break;  
-
-        case DEV_PALETTE :
-        {
-          int val=((pick_list *)ev.message.data)->get_selection();          
-          pal_wins[val]->open_window();
-        } break;
-
-        case DEV_MUSIC_PICKLIST : 
-        {         
-/*          int *val=((int *)((pick_list *)ev.message.data)->read());
-            if (current_song) delete current_song;
-            current_song=new song(song_list[*val]);
-            current_song->play();           */
-        }             
-        break;           
-
-        case DEV_OEDIT_OK : 
-        { close_oedit_window(); } break;
-          
-        case DEV_OEDIT_DELETE : 
-        {
-          selected_object=edit_object;
-          do_command("delete",ev);
-          close_oedit_window();
-        }
-        break;
-          
-        case DEV_OEDIT_FRONT : 
-        {
-          do_command("to_front",ev);
-          close_oedit_window();                     
-        }
-        break;
-
-        case DEV_OEDIT_BACK : 
-        {
-          do_command("to_back",ev);
-          close_oedit_window();                     
-        }
-        break;
-
-        case DEV_OEDIT_MOVE :       
-        {
-          game_object *o=edit_object;
-          close_oedit_window();
-          edit_object=o;
-          do_command("move",ev);
-        }
-        break;   
+    {
+      demo_man.set_state(demo_manager::PLAYING,mess_win->read(ID_PLAY_DEMO_FILENAME));
+      wm->close_window(mess_win);
+      mess_win=NULL;
+    } break;
+
+    case ID_SET_SCROLL :
+    {
+      if (!mess_win)
+      {
+        int h=wm->font()->height()+8;
+        mess_win=wm->new_window(xres/2,yres/2,-1,-1,
+            new text_field(0,h*0,ID_MESS_STR1,symbol_str("x_mul"),"****",bg_xmul,
+            new text_field(0,h*1,ID_MESS_STR2,symbol_str("x_div"),"****",bg_xdiv,
+            new text_field(0,h*2,ID_MESS_STR3,symbol_str("y_mul"),"****",bg_ymul,
+            new text_field(0,h*3,ID_MESS_STR4,symbol_str("y_div"),"****",bg_ydiv,
+                   new button(10,h*4,ID_SET_SCROLL_CHECK,symbol_str("ok_button"),
+                   new button(40,h*4,ID_CANCEL,symbol_str("cancel_button"),NULL)))))),symbol_str("_scroll"));
+      }
+    } break;
+    case ID_SET_SCROLL_CHECK :
+    {
+      int tbg_xmul=atoi(mess_win->read(ID_MESS_STR1));
+      int tbg_xdiv=atoi(mess_win->read(ID_MESS_STR2));
+      int tbg_ymul=atoi(mess_win->read(ID_MESS_STR3));
+      int tbg_ydiv=atoi(mess_win->read(ID_MESS_STR4));
+
+      if ( (((float)tbg_xmul/(float)tbg_xdiv) < ((float)bg_xmul/(float)bg_xdiv)) ||
+          (((float)tbg_ymul/(float)tbg_ydiv) < ((float)bg_ymul/(float)bg_ydiv)))
+      {
+        int h=wm->font()->height()+8;
+
+        warn_win=wm->new_window(xres/2-40,yres/2-40,-1,-1,
+                  new info_field(0,0,ID_NULL,
+                      symbol_str("back_loss"),
+                      new button(10,h*4,ID_SET_SCROLL_OK,symbol_str("ok_button"),
+                      new button(40,h*4,ID_WARN_CANCEL,symbol_str("cancel_button"),NULL))),
+                    symbol_str("WARNING"));
+        wm->grab_focus(warn_win);
+      } else wm->push_event(new event(ID_SET_SCROLL_OK,NULL));
+    } break;
+    case ID_WARN_CANCEL :
+    {
+      wm->close_window(warn_win); warn_win=NULL;
+      wm->push_event(new event(ID_CANCEL,NULL));
+    } break;
+    case ID_SET_SCROLL_OK :
+    {
+      if (warn_win) { wm->close_window(warn_win); warn_win=NULL; }
+      bg_xmul=atoi(mess_win->read(ID_MESS_STR1));
+      bg_xdiv=atoi(mess_win->read(ID_MESS_STR2));
+      bg_ymul=atoi(mess_win->read(ID_MESS_STR3));
+      bg_ydiv=atoi(mess_win->read(ID_MESS_STR4));
+      wm->push_event(new event(ID_CANCEL,NULL));        // close window
+    } break;
+
+    case ID_CENTER_PLAYER :
+    {
+       do_command("center",ev); break;
+    } break;
+
+    case ID_INTERPOLATE_DRAW :
+    {
+      interpolate_draw=!interpolate_draw;
+    } break;
+
+    case ID_DISABLE_AUTOLIGHT :
+    {
+      disable_autolight=!disable_autolight;
+    } break;
+
+    case ID_ADD_PALETTE :
+    {
+      if (!mess_win)
+      {
+        int h=wm->font()->height()+8;
+        mess_win=wm->new_window(xres/2,yres/2,-1,-1,
+            new text_field(0,h*0,ID_MESS_STR1,symbol_str("ap_width"),"****",2,
+            new text_field(0,h*1,ID_MESS_STR2,symbol_str("ap_height"),"****",2,
+            new text_field(0,h*2,ID_MESS_STR3,symbol_str("ap_name"),"***********","pal",
+                   new button(10,h*3,ID_ADD_PALETTE_OK,symbol_str("ok_button"),
+                   new button(40,h*3,ID_CANCEL,symbol_str("cancel_button"),NULL))))),symbol_str("ap_pal"));
+      }
+    } break;
+    case ID_ADD_PALETTE_OK :
+    {
+      char name[70];
+      sprintf(name,"(add_palette \"%s\" %d %d)",mess_win->read(ID_MESS_STR3),
+          atoi(mess_win->read(ID_MESS_STR1)),
+          atoi(mess_win->read(ID_MESS_STR2)));
+      char const *s=name;
+      eval(compile(s));
+      wm->push_event(new event(ID_CANCEL,NULL));        // close window
+    } break;
+    case ID_TOGGLE_DELAY :
+    {
+      the_game->toggle_delay(); break;
+    } break;
+
+    case ID_SMALL_MODE :
+    {
+      make_screen_size(311,160); break;
+    } break;
+    case ID_CLEAR_WEAPONS :
+    {
+      event ev;
+      do_command("clear_weapons",ev);
+    } break;
+    case ID_GOD_MODE :
+    {
+      for (view *v=player_list;v;v=v->next)
+        v->god=!v->god;
+    } break;
+    case ID_MOUSE_SCROLL :
+    {
+      mouse_scrolling=!mouse_scrolling;
+      prop->setd("mouse_scrolling",mouse_scrolling);
+      if (mouse_scrolling)
+        the_game->show_help(symbol_str("ms_on"));
+      else
+        the_game->show_help(symbol_str("ms_off"));
+    } break;
+
+    case ID_LOCK_PALETTES :
+    {
+      palettes_locked=!palettes_locked;
+      prop->setd("palettes_locked",palettes_locked);
+      if (palettes_locked)
+        the_game->show_help(symbol_str("pal_lock"));
+      else the_game->show_help(symbol_str("pal_unlock"));
+    } break;
+
+    case ID_DISABLE_VIEW_SHIFT :
+    {
+      view_shift_disabled=!view_shift_disabled;
+      prop->setd("view_shift_disabled",view_shift_disabled);
+      if (view_shift_disabled)
+        the_game->show_help(symbol_str("vs_dis"));
+      else the_game->show_help(symbol_str("vs_en"));
+    } break;
+
+    case ID_WIN_FORE :
+    {
+      toggle_fgw();
+    } break;
+    case ID_WIN_BACK :
+    {
+      toggle_bgw();
+    } break;
+    case ID_WIN_OBJECTS :
+    {
+      toggle_omenu();
+    } break;
+    case ID_WIN_PALETTES :
+    {
+      toggle_pmenu();
+    } break;
+    case ID_WIN_LIGHTING :
+    {
+      toggle_light_window();
+    } break;
+    case ID_WIN_LAYERS :
+    {
+      toggle_show_menu();
+    } break;
+    case ID_WIN_CONSOLE :
+    {
+      if (dev_console) dev_console->toggle();
+    } break;
+    case ID_WIN_TOOLBAR :
+    {
+      toggle_toolbar();
+    } break;
+
+    case DEV_AMBIENT :
+    { if (!ambw) make_ambient(); } break;
+    case DEV_AREA_OK :
+    { close_area_win(1); } break;
+    case DEV_AREA_DELETE :
+    { close_area_win(0);
+      if (current_area && current_level)
+      {
+        if (current_level->area_list==current_area)
+          current_level->area_list=current_level->area_list->next;
+        else
+        {
+          area_controller *a=current_level->area_list,*l=NULL;
+          for (;a!=current_area && a;a=a->next) { l=a; }
+          l->next=a->next;
+          delete a;
+        }
+        current_area=NULL;
+        the_game->need_refresh();
+      }
+    } break;
+    case DEV_AI_OK :
+      close_ai_window(); break;
+    case DEV_OEDIT_AI :
+      make_ai_window(edit_object); break;
+    case DEV_OBJECTS_DELETE :
+    {
+      if (edit_object)
+      {
+        for (int i=0;i<edit_object->total_objects();i++)
+          edit_object->remove_object(edit_object->get_object(0));
+        the_game->need_refresh();
+      }
+    } break;
+
+    case DEV_LIGHTS_DELETE :
+    {
+      if (edit_object)
+      {
+        for (int i=0;i<edit_object->total_lights();i++)
+          edit_object->remove_light(edit_object->get_light(0));
+        the_game->need_refresh();
+      }
+    } break;
+
+    case DEV_LEDIT_DEL :
+    {
+      prop->setd("ledit x",ledit->x);
+      prop->setd("ledit y",ledit->y);
+      wm->close_window(ledit); ledit=NULL;
+      if (current_level)
+        current_level->remove_light(edit_light);
+      else
+        delete_light(edit_light);
+      edit_light=NULL;
+      the_game->need_refresh();
+    } break;
+    case DEV_LEDIT_OK :
+    {
+      edit_light->xshift=atoi(ledit->read(DEV_LEDIT_W));
+      edit_light->yshift=atoi(ledit->read(DEV_LEDIT_H));
+      edit_light->inner_radius=atoi(ledit->read(DEV_LEDIT_R1));
+      edit_light->outer_radius=atoi(ledit->read(DEV_LEDIT_R2));
+      if (edit_light->outer_radius<=edit_light->inner_radius)
+      {
+        edit_light->inner_radius=edit_light->outer_radius-1;
+        if (edit_light->inner_radius<1)
+        {
+          edit_light->inner_radius=1;
+          edit_light->outer_radius=2;
+        }
+      }
+
+      edit_light->calc_range();
+      edit_light=NULL;
+      prop->setd("ledit x",ledit->x);
+      prop->setd("ledit y",ledit->y);
+      wm->close_window(ledit); ledit=NULL;
+      the_game->need_refresh();
+    } break;
+    case DEV_LEDIT_MOVE :
+    {
+      prop->setd("ledit x",ledit->x);
+      prop->setd("ledit y",ledit->y);
+      wm->close_window(ledit); ledit=NULL;
+      state=DEV_MOVE_LIGHT;
+    } break;
+    case DEV_LEDIT_COPY :
+    {
+      edit_light=edit_light->copy();
+      prop->setd("ledit x",ledit->x);
+      prop->setd("ledit y",ledit->y);
+      wm->close_window(ledit); ledit=NULL;
+      state=DEV_MOVE_LIGHT;
+    } break;
+
+
+    case DEV_LIGHT0 :
+    case DEV_LIGHT1 :
+    case DEV_LIGHT2 :
+    case DEV_LIGHT3 :
+    case DEV_LIGHT4 :
+    case DEV_LIGHT5 :
+    case DEV_LIGHT6 :
+    case DEV_LIGHT7 :
+    case DEV_LIGHT8 :
+    case DEV_LIGHT9 :
+    {
+      int32_t lx,ly;
+      the_game->mouse_to_game(last_demo_mx,last_demo_my,lx,ly);
+      lx=snap_x(lx);
+      ly=snap_y(ly);
+      edit_light=add_light_source(ev.message.id-DEV_LIGHT0,lx,ly,
+                       atoi(lightw->read(DEV_LIGHTR1)),
+                       atoi(lightw->read(DEV_LIGHTR2)),
+                       atoi(lightw->read(DEV_LIGHTW)),
+                       atoi(lightw->read(DEV_LIGHTH)));
+      state=DEV_MOVE_LIGHT;
+    } break;
+    case ID_RAISE_ALL :
+    {
+      raise_all=!raise_all;
+      prop->setd("raise_all",raise_all);
+      if (raise_all)
+        the_game->show_help(symbol_str("fg_r"));
+      else
+        the_game->show_help(symbol_str("fg_l"));
+    } break;
+    case DEV_OEDIT_COPY :
+    {
+      game_object *use=copy_object;
+      if (!use) use=edit_object;
+      if (use)
+      {
+        game_object *old=use;
+        close_oedit_window();
+        if (use->controller())
+          the_game->show_help(symbol_str("no_clone"));
+        else
+        {
+          edit_object=old->copy();
+
+          current_level->add_object(edit_object);
+          the_game->need_refresh();
+          state=DEV_MOVE_OBJECT;
+
+          close_oedit_window();
+          copy_object=NULL;
+        }
+      }
+    } break;
+    case DEV_OEDIT_LEFT :
+    {
+      if (edit_object)
+      {
+        the_game->need_refresh();
+        edit_object->direction=-1;
+      }
+    } break;
+    case DEV_OEDIT_RIGHT :
+    {
+      if (edit_object)
+      {
+        the_game->need_refresh();
+        edit_object->direction=1;
+      }
+    } break;
+
+
+    case DEV_COMMAND_OK :
+    {
+      char cmd[100];
+      strcpy(cmd,commandw->inm->get(DEV_COMMAND)->read());
+      prop->setd("commandw x",commandw->x);
+      prop->setd("commandw y",commandw->y);
+      wm->close_window(commandw);
+      commandw=NULL;
+      do_command(cmd,ev);
+    } break;
+
+    case ID_SHOW_FPS :
+    { fps_on=!fps_on; } break;
+    case ID_PROFILE :
+    { profile_toggle();
+      profile_on=!profile_on;
+    } break;
+
+    case ID_TOGGLE_NAMES : { show_names=!show_names; } break;
+    case DEV_QUIT : the_game->end_session(); break;
+    case DEV_EDIT_FG : dev=1; break; //the_game->draw(); break;
+    case DEV_EDIT_BG : dev=2; break; //the_game->draw(); break;
+    case DEV_EDIT_FGBG : dev=3; break; //the_game->draw(); break;
+    case DEV_PLAY : dev=0; break; //the_game->draw(); break;
+    case SHOW_FOREGROUND :
+    { dev=dev^DRAW_FG_LAYER; the_game->need_refresh(); } break;
+    case SHOW_FOREGROUND_BOUND :
+    { dev=dev^DRAW_FG_BOUND_LAYER; the_game->need_refresh(); } break;
+    case SHOW_BACKGROUND :
+    { dev=dev^DRAW_BG_LAYER; the_game->need_refresh(); } break;
+    case SHOW_CHARACTERS :
+    { dev=dev^DRAW_PEOPLE_LAYER; the_game->need_refresh(); } break;
+    case SHOW_LIGHT :
+    { dev=dev^DRAW_LIGHTS; the_game->need_refresh(); } break;
+    case SHOW_LINKS :
+    { dev=dev^DRAW_LINKS;  the_game->need_refresh(); } break;
+
+
+    case DEV_CREATE :
+    {
+      int val=get_omenu_item(((pick_list *)ev.message.data)->get_selection());
+      char cmd[100];
+      sprintf(cmd,"create %s",object_names[val]);
+      do_command(cmd,ev);
+      state=DEV_CREATE_OBJECT;
+      dev|=(EDIT_MODE | DRAW_PEOPLE_LAYER);
+    }
+    break;
+
+    case DEV_PALETTE :
+    {
+      int val=((pick_list *)ev.message.data)->get_selection();
+      pal_wins[val]->open_window();
+    } break;
+
+    case DEV_MUSIC_PICKLIST :
+    {
+/*        int *val=((int *)((pick_list *)ev.message.data)->read());
+        if (current_song) delete current_song;
+        current_song=new song(song_list[*val]);
+        current_song->play();        */
+    }
+    break;
+
+    case DEV_OEDIT_OK :
+    { close_oedit_window(); } break;
+
+    case DEV_OEDIT_DELETE :
+    {
+      selected_object=edit_object;
+      do_command("delete",ev);
+      close_oedit_window();
+    }
+    break;
+
+    case DEV_OEDIT_FRONT :
+    {
+      do_command("to_front",ev);
+      close_oedit_window();
+    }
+    break;
+
+    case DEV_OEDIT_BACK :
+    {
+      do_command("to_back",ev);
+      close_oedit_window();
+    }
+    break;
+
+    case DEV_OEDIT_MOVE :
+    {
+      game_object *o=edit_object;
+      close_oedit_window();
+      edit_object=o;
+      do_command("move",ev);
+    }
+    break;
       }
     } break;
@@ -2698 +2716 @@
     {
       if (ev.window)
-      {   
-        if (ev.window==commandw)
-        {
-          prop->setd("commandw x",commandw->x);
-          prop->setd("commandw y",commandw->y);   
-          wm->close_window(commandw); 
-          commandw=NULL;        
-        } else if (ev.window==oedit)
-          close_oedit_window();
-        else if (ev.window==ambw)
-        { wm->close_window(ambw); ambw=NULL; }
-        else if (ev.window==backw) toggle_bgw();
-        else if (ev.window==forew) toggle_fgw();
-        else if (ev.window==lightw) toggle_light_window();
-        else if (ev.window==show_menu) toggle_show_menu();
-        else if (ev.window==pmenu) toggle_pmenu();
-        else if (ev.window==tbw) toggle_toolbar();
-        else if (ev.window==omenu) toggle_omenu();
-        else if (ev.window==memprof) toggle_memprof();
-        else if (ev.window==search_window) toggle_search_window();
-        else if (profile_handle_event(ev))  profile_on=!profile_on;
-        else if (chat->chat_event(ev)) chat->toggle();
-    
-      } 
+      {
+    if (ev.window==commandw)
+    {
+      prop->setd("commandw x",commandw->x);
+      prop->setd("commandw y",commandw->y);
+      wm->close_window(commandw);
+      commandw=NULL;
+    } else if (ev.window==oedit)
+      close_oedit_window();
+    else if (ev.window==ambw)
+    { wm->close_window(ambw); ambw=NULL; }
+    else if (ev.window==backw) toggle_bgw();
+    else if (ev.window==forew) toggle_fgw();
+    else if (ev.window==lightw) toggle_light_window();
+    else if (ev.window==show_menu) toggle_show_menu();
+    else if (ev.window==pmenu) toggle_pmenu();
+    else if (ev.window==tbw) toggle_toolbar();
+    else if (ev.window==omenu) toggle_omenu();
+    else if (ev.window==memprof) toggle_memprof();
+    else if (ev.window==search_window) toggle_search_window();
+    else if (profile_handle_event(ev))  profile_on=!profile_on;
+    else if (chat->chat_event(ev)) chat->toggle();
+
+      }
     }
     break;
@@ -2729 +2747 @@
       {
         if (!edit_object && link_object && selected_object && link_object!=selected_object)
-        {
-          link_object->add_object(selected_object);
-          if (S_LINK_SND>0) cash.sfx(S_LINK_SND)->play(sfx_volume/2);
-          the_game->need_refresh();
-        }
-
-        link_object=NULL;
+    {
+      link_object->add_object(selected_object);
+      if (S_LINK_SND>0) cash.sfx(S_LINK_SND)->play(sfx_volume/2);
+      the_game->need_refresh();
+    }
+
+    link_object=NULL;
       }
     } break;
     case EV_KEY :
-    {   
+    {
       if (backw && ev.window==backw)
       { if (ev.key=='-' && bg_scale<the_game->btile_height()/2)
-        { toggle_bgw();
-          bg_scale++;
-          toggle_bgw();
-        } else if (ev.key=='+' && bg_scale>1)
-        { toggle_bgw();
-          bg_scale--;
-          toggle_bgw();
-        } else if (ev.key=='b') toggle_bgw();
-        else if (ev.key=='B') { toggle_bgw(); bg_w++; if (bg_w>6) bg_w=1; toggle_bgw(); }
+    { toggle_bgw();
+      bg_scale++;
+      toggle_bgw();
+    } else if (ev.key=='+' && bg_scale>1)
+    { toggle_bgw();
+      bg_scale--;
+      toggle_bgw();
+    } else if (ev.key=='b') toggle_bgw();
+    else if (ev.key=='B') { toggle_bgw(); bg_w++; if (bg_w>6) bg_w=1; toggle_bgw(); }
       }
       if (forew && ev.window==forew)
       { if (ev.key=='-' && fg_scale<the_game->ftile_height()/2)
-        { toggle_fgw();
-          fg_scale++;
-          toggle_fgw();
-        } else if (ev.key=='+' && fg_scale>1)
-        { toggle_fgw();
-          fg_scale--;
-          toggle_fgw();
-        } else if (ev.key=='i')
-        {
-          toggle_fgw();
-          fg_reversed=!fg_reversed;
-          prop->setd("fg_reversed",fg_reversed);
-          toggle_fgw();
-        } else if (ev.key=='f') toggle_fgw();
-
-        else if (ev.key=='F') { toggle_fgw(); fg_w++; if (fg_w>6) fg_w=1; toggle_fgw(); }
+    { toggle_fgw();
+      fg_scale++;
+      toggle_fgw();
+    } else if (ev.key=='+' && fg_scale>1)
+    { toggle_fgw();
+      fg_scale--;
+      toggle_fgw();
+    } else if (ev.key=='i')
+    {
+      toggle_fgw();
+      fg_reversed=!fg_reversed;
+      prop->setd("fg_reversed",fg_reversed);
+      toggle_fgw();
+    } else if (ev.key=='f') toggle_fgw();
+
+    else if (ev.key=='F') { toggle_fgw(); fg_w++; if (fg_w>6) fg_w=1; toggle_fgw(); }
       }
       if (ev.window==NULL || ev.window==pmenu ||
-          ev.window==forew || is_pal_win(ev.window))  // main window actions
-      {         
-        switch (ev.key)
-        {
-          case JK_CTRL_L : if (!edit_object && !link_object) { link_object=selected_object; }
-          case 'n' : current_level->next_focus(); break;                           
-//        case '/' : if (dev_console) dev_console->toggle(); break;       
-          case 't' :
-          {
-            if (ev.window==NULL || ev.window==forew)
-            {
-              the_game->ftile_on(last_demo_mx,last_demo_my,x,y);
-              fg_fill(cur_fg,x,y,NULL);
-            }
-          } break;
-          case 'f' : toggle_fgw(); break;
-          case 'M' : toggle_music_window(); break;                         
-
-          case 'b' : toggle_bgw(); break;
-          case 'a' : toggle_toolbar(); break;
-          case 'A' : { if (selected_object)
-                       {
-                         if (oedit) wm->push_event(new event(DEV_OEDIT_OK,NULL));                      
-                         make_ai_window(selected_object);
-                       }
-                     } break;
-                     
-          case 'o' : toggle_omenu(); break;                   
-
-          case '<' : do_command("to_back",ev); break;
-
-          case '>' : do_command("to_front",ev); break;
-          case 'p' : toggle_pmenu(); break;                   
-          case 'P' : profile_toggle(); break;
-          case '|' : toggle_memprof(); break;
-          case '.' : 
-          { 
-            if (last_created_type>=0)
-            {
-              int val=last_created_type;
-              char cmd[100];
-              sprintf(cmd,"create %s",object_names[val]);
-              do_command(cmd,ev);
-              state=DEV_CREATE_OBJECT;
-              dev|=(EDIT_MODE | DRAW_PEOPLE_LAYER);         
-            }
-          }             
-          break;        
-
-
-          case 'd' : { do_command("delete",ev);  the_game->need_refresh(); } break;
-          case 'i' : 
-          {       
-            fg_reversed=!fg_reversed;
-            prop->setd("fg_reversed",fg_reversed);
-            if (forew)
-            {
-              toggle_fgw();
-              toggle_fgw();
-            }
-          } break;
-          case 'l' : toggle_light_window(); break;
-          case '!' :
-          case '@' :
-          case '#' :
-          case '$' :
-          case '%' :
-          case '^' :
-          case '&' :
-          case '*' :
-          case '(' :
-          case ')' :
-
-          case '0' :
-          case '1' :
-          case '2' :
-          case '3' :
-          case '4' :
-          case '5' :
-          case '6' :
-          case '7' :
-          case '8' :
-          case '9' : do_command("set_aitype",ev); break;
-          case 'c' : do_command("center",ev); break;
-          case 'C' :  
-          if (selected_object && selected_object->controller()==NULL)
-          { copy_object=selected_object;
-                        wm->push_event(new event(DEV_OEDIT_COPY,NULL)); } break;
-          
-          case 'D' : the_game->toggle_delay(); break;
-          case 'L' : toggle_show_menu(); break;
-          case '`' : do_command("fg_select",ev); break;
-          case 'r' : { do_command("toggle_fg_raise",ev); the_game->need_refresh(); }  break;
-          case '[' : do_command("fg_add -1",ev); break;
-          case ']' : do_command("fg_add 1",ev); break;
-          case 'R' : do_command("reload",ev); break;
-          case 'w' : 
-          {       
-            int32_t rx,ry;
-            the_game->mouse_to_game(dlastx,dlasty,rx,ry);
-            char msg[100]; sprintf(msg,symbol_str("mouse_at"),rx,ry);
-            the_game->show_help(msg);
-            the_game->need_refresh();
-          } break;
-          case 'k' :
-          {
-            if (selected_object && selected_object->total_objects()) 
-              selected_object->remove_object(selected_object->get_object(0));
-            the_game->need_refresh();
-          } break;
-          case 'K' :
-          {
-            if (selected_object && selected_object->total_objects()) 
-              selected_object->remove_object(selected_object->get_object(selected_object->total_objects()-1));
-            the_game->need_refresh();
-          } break;
-          case 'j' :
-          {
-            if (current_level && player_list && player_list->focus)
-            {
-              int32_t rx,ry;
-              the_game->mouse_to_game(dlastx,dlasty,rx,ry);
-              player_list->focus->x=rx;
-              player_list->focus->y=ry;
-              do_command("center",ev);
-              the_game->need_refresh();
-            }
-          } break;
-          case 'z' : do_command("clear_weapons",ev); break;       
-          case 'Z' : if (dev&EDIT_MODE)
-          { view *v=the_game->view_in(last_demo_mx,last_demo_my);
-            if (v)
-            {
-              v->god=!v->god;
-              sbar.redraw(screen);
-            }
-          } break;
-          case ' ' : 
-          {
-            if (dev & EDIT_MODE)
-            {
-              if (selected_object)
-              {
-                if (oedit)
-                  close_oedit_window();
-                edit_object=selected_object;
-                do_command("move",ev);
-              } else if (selected_light)
-              {
-                if (ledit)
-                {
-                  wm->close_window(ledit);
-                  ledit=NULL;
-                }
-                edit_light=selected_light;
-                do_command("move_light",ev);
-              }
-              
-            } break;        
-          }       
-          case 'x' : 
-          {
-            if (selected_object) 
-            { if (selected_object->direction>0)
-              selected_object->direction=-1;
-            else selected_object->direction=1;
-            }
-          } break;
-          
-        }         
-      }
-    }
-  }
-  
+      ev.window==forew || is_pal_win(ev.window))  // main window actions
+      {
+    switch (ev.key)
+    {
+      case JK_CTRL_L : if (!edit_object && !link_object) { link_object=selected_object; }
+      case 'n' : current_level->next_focus(); break;
+//      case '/' : if (dev_console) dev_console->toggle(); break;
+      case 't' :
+      {
+        if (ev.window==NULL || ev.window==forew)
+        {
+          the_game->ftile_on(last_demo_mx,last_demo_my,x,y);
+          fg_fill(cur_fg,x,y,NULL);
+        }
+      } break;
+      case 'f' : toggle_fgw(); break;
+      case 'M' : toggle_music_window(); break;
+
+      case 'b' : toggle_bgw(); break;
+      case 'a' : toggle_toolbar(); break;
+      case 'A' : { if (selected_object)
+               {
+             if (oedit) wm->push_event(new event(DEV_OEDIT_OK,NULL));
+             make_ai_window(selected_object);
+               }
+             } break;
+
+      case 'o' : toggle_omenu(); break;
+
+      case '<' : do_command("to_back",ev); break;
+
+      case '>' : do_command("to_front",ev); break;
+      case 'p' : toggle_pmenu(); break;
+      case 'P' : profile_toggle(); break;
+      case '|' : toggle_memprof(); break;
+      case '.' :
+      {
+        if (last_created_type>=0)
+        {
+          int val=last_created_type;
+          char cmd[100];
+          sprintf(cmd,"create %s",object_names[val]);
+          do_command(cmd,ev);
+          state=DEV_CREATE_OBJECT;
+          dev|=(EDIT_MODE | DRAW_PEOPLE_LAYER);
+        }
+      }
+      break;
+
+
+      case 'd' : { do_command("delete",ev);  the_game->need_refresh(); } break;
+      case 'i' :
+      {
+        fg_reversed=!fg_reversed;
+        prop->setd("fg_reversed",fg_reversed);
+        if (forew)
+        {
+          toggle_fgw();
+          toggle_fgw();
+        }
+      } break;
+      case 'l' : toggle_light_window(); break;
+      case '!' :
+      case '@' :
+      case '#' :
+      case '$' :
+      case '%' :
+      case '^' :
+      case '&' :
+      case '*' :
+      case '(' :
+      case ')' :
+
+      case '0' :
+      case '1' :
+      case '2' :
+      case '3' :
+      case '4' :
+      case '5' :
+      case '6' :
+      case '7' :
+      case '8' :
+      case '9' : do_command("set_aitype",ev); break;
+      case 'c' : do_command("center",ev); break;
+      case 'C' :
+      if (selected_object && selected_object->controller()==NULL)
+      { copy_object=selected_object;
+            wm->push_event(new event(DEV_OEDIT_COPY,NULL)); } break;
+
+      case 'D' : the_game->toggle_delay(); break;
+      case 'L' : toggle_show_menu(); break;
+      case '`' : do_command("fg_select",ev); break;
+      case 'r' : { do_command("toggle_fg_raise",ev); the_game->need_refresh(); }  break;
+      case '[' : do_command("fg_add -1",ev); break;
+      case ']' : do_command("fg_add 1",ev); break;
+      case 'R' : do_command("reload",ev); break;
+      case 'w' :
+      {
+        int32_t rx,ry;
+        the_game->mouse_to_game(dlastx,dlasty,rx,ry);
+        char msg[100]; sprintf(msg,symbol_str("mouse_at"),rx,ry);
+        the_game->show_help(msg);
+        the_game->need_refresh();
+      } break;
+      case 'k' :
+      {
+        if (selected_object && selected_object->total_objects())
+          selected_object->remove_object(selected_object->get_object(0));
+        the_game->need_refresh();
+      } break;
+      case 'K' :
+      {
+        if (selected_object && selected_object->total_objects())
+          selected_object->remove_object(selected_object->get_object(selected_object->total_objects()-1));
+        the_game->need_refresh();
+      } break;
+      case 'j' :
+      {
+        if (current_level && player_list && player_list->focus)
+        {
+          int32_t rx,ry;
+          the_game->mouse_to_game(dlastx,dlasty,rx,ry);
+          player_list->focus->x=rx;
+          player_list->focus->y=ry;
+          do_command("center",ev);
+          the_game->need_refresh();
+        }
+      } break;
+      case 'z' : do_command("clear_weapons",ev); break;
+      case 'Z' : if (dev&EDIT_MODE)
+      { view *v=the_game->view_in(last_demo_mx,last_demo_my);
+        if (v)
+        {
+          v->god=!v->god;
+          sbar.redraw(screen);
+        }
+      } break;
+      case ' ' :
+      {
+        if (dev & EDIT_MODE)
+        {
+          if (selected_object)
+          {
+        if (oedit)
+          close_oedit_window();
+        edit_object=selected_object;
+        do_command("move",ev);
+          } else if (selected_light)
+          {
+        if (ledit)
+        {
+          wm->close_window(ledit);
+          ledit=NULL;
+        }
+        edit_light=selected_light;
+        do_command("move_light",ev);
+          }
+
+        } break;
+      }
+      case 'x' :
+      {
+        if (selected_object)
+        { if (selected_object->direction>0)
+          selected_object->direction=-1;
+        else selected_object->direction=1;
+        }
+      } break;
+
+    }
+      }
+    }
+  }
+
 
 }
@@ -2958 +2976 @@
 
 
-pal_win::pal_win(void *args) 
+pal_win::pal_win(void *args)
 {
   int i=0;
   Cell *ao=(Cell *)args;
- 
+
   name=strcpy((char *)jmalloc(strlen(lstring_value(CAR(args)))+1,
-                              "pal name"),lstring_value(CAR(args)));
+                  "pal name"),lstring_value(CAR(args)));
   ao=CDR(ao);
   scale=w=h=1;
   x=y=0;
-  
+
   if (!NILP(ao))
   {
@@ -2977 +2995 @@
       if (!NILP(ao))
       {
-        x=lnumber_value(CAR(ao)); ao=CDR(ao);
-        if (!NILP(ao))
-        {
-          y=lnumber_value(CAR(ao)); ao=CDR(ao);
-          if (!NILP(ao))
-            scale=lnumber_value(CAR(ao)); ao=CDR(ao);
-        }
+    x=lnumber_value(CAR(ao)); ao=CDR(ao);
+    if (!NILP(ao))
+    {
+      y=lnumber_value(CAR(ao)); ao=CDR(ao);
+      if (!NILP(ao))
+        scale=lnumber_value(CAR(ao)); ao=CDR(ao);
+    }
       }
     }
@@ -2996 +3014 @@
   {
     if (i>w*h)
-    { 
+    {
       lbreak("to many parameters to add_palette ");
       exit(0);
@@ -3003 +3021 @@
     // make sure the tile that they suggested exists
     if (pat[i]<=0 || pat[i]>nforetiles || foretiles[pat[i]]<0)
-      pat[i]=0;    
+      pat[i]=0;
     ao=CDR(ao);
     i++;
@@ -3013 +3031 @@
 
 void pal_win::open_window()
-{ 
+{
   if (me) close_window();
   me=wm->new_window(x,y,w*f_wid/scale,h*f_hi/scale,NULL,name);
@@ -3028 +3046 @@
     wm->close_window(me);
     me=NULL;
-    
+
   }
 }
@@ -3043 +3061 @@
     for (i=0;i<w*h;i++)
     {
-      im->clear();      
+      im->clear();
       the_game->get_fg(pat[i])->im->put_image(im,0,0);
       scale_put(im,me->screen,me->x1()+(i%w)*tw,
-                me->y1()+(i/w)*th,tw,th);
+        me->y1()+(i/w)*th,tw,th);
       if (d==pat[i])
       {
-        find=i;
-        me->screen->rectangle(me->x1()+(i%w)*tw,
-                          me->y1()+(i/w)*th,
-                          me->x1()+(i%w)*tw+tw-1,
-                          me->y1()+(i/w)*th+th-1,wm->bright_color());
+    find=i;
+    me->screen->rectangle(me->x1()+(i%w)*tw,
+              me->y1()+(i/w)*th,
+              me->x1()+(i%w)*tw+tw-1,
+              me->y1()+(i/w)*th+th-1,wm->bright_color());
       }
     }
@@ -3061 +3079 @@
 }
 
-void pal_win::handle_event(event &ev) 
+void pal_win::handle_event(event &ev)
 {
   int d=cur_fg;
@@ -3068 +3086 @@
   {
     int i,dr=0;
-    for (i=0;i<w*h;i++) 
-    {
-      if (pat[i]==d || pat[i]==last_selected) 
+    for (i=0;i<w*h;i++)
+    {
+      if (pat[i]==d || pat[i]==last_selected)
         dr=1;
     }
@@ -3084 +3102 @@
       {
         if (ev.mouse_button==1)
-        {         
-          int selx=(last_demo_mx-me->x-me->x1())/(the_game->ftile_width()/scale),
-              sely=(last_demo_my-me->y-me->y1())/(the_game->ftile_height()/scale);
-          if (selx>=0 && sely>=0 && selx<w && sely<h)
-          {
-            cur_fg=pat[selx+sely*w];
-            if (dev_cont->forew)      
-              ((tile_picker *)dev_cont->forew->
-               read(DEV_FG_PICKER))->recenter(dev_cont->forew->screen);      
-          }
-        } else if (ev.mouse_button==2)
-        {
-          if (palettes_locked)
-            the_game->show_help(symbol_str("pal_lock"));
-          else
-          {
-            int selx=(last_demo_mx-me->x-me->x1())/(the_game->ftile_width()/scale),
-                sely=(last_demo_my-me->y-me->y1())/(the_game->ftile_height()/scale);
-            if (selx>=0 && sely>=0 && selx<w && sely<h)
-            {
-              pat[selx+sely*w]=cur_fg;
-              draw();
-            }
-          }
-        }
+    {
+      int selx=(last_demo_mx-me->x-me->x1())/(the_game->ftile_width()/scale),
+          sely=(last_demo_my-me->y-me->y1())/(the_game->ftile_height()/scale);
+      if (selx>=0 && sely>=0 && selx<w && sely<h)
+      {
+        cur_fg=pat[selx+sely*w];
+        if (dev_cont->forew)
+          ((tile_picker *)dev_cont->forew->
+           read(DEV_FG_PICKER))->recenter(dev_cont->forew->screen);
+      }
+    } else if (ev.mouse_button==2)
+    {
+      if (palettes_locked)
+        the_game->show_help(symbol_str("pal_lock"));
+      else
+      {
+        int selx=(last_demo_mx-me->x-me->x1())/(the_game->ftile_width()/scale),
+            sely=(last_demo_my-me->y-me->y1())/(the_game->ftile_height()/scale);
+        if (selx>=0 && sely>=0 && selx<w && sely<h)
+        {
+          pat[selx+sely*w]=cur_fg;
+          draw();
+        }
+      }
+    }
       } break;
 
@@ -3114 +3132 @@
       {
         switch (ev.key)
-        {
-          case '+' :
-          { if (scale>1)  
-            {
-              close_window();
-              scale--;
-              open_window();
-            }
-          } break;
-          case '-' :
-          { if (scale<the_game->ftile_height()/2) 
-            {
-              close_window();
-              scale++;
-              open_window();
-            }
-          } break;        
-          case JK_LEFT : 
-          {
-            if (palettes_locked) the_game->show_help(symbol_str("pal_lock"));
-            else if (w>1) resize(-1,0);
-          } break;
-          case JK_RIGHT : 
-          {
-            if (palettes_locked) the_game->show_help(symbol_str("pal_lock"));
-            else
-              resize(1,0); 
-          } break;
-          case JK_UP : 
-          {
-            if (palettes_locked) the_game->show_help(symbol_str("pal_lock"));
-            else if (h>1) resize(0,-1); 
-          } break;
-          case JK_DOWN : 
-          {
-            if (palettes_locked)            
-              the_game->show_help(symbol_str("pal_lock"));
-            else
-              resize(0,1); 
-          } break;       
-          case JK_ESC : close_window();  break;
-          case ' ' : 
-          {
-            int32_t xs,ys,xx,yy;
-            the_game->ftile_on(me->x,me->y,xs,ys);
-
-            for (xx=xs;xx<xs+w;xx++)
-            {
-              for (yy=ys;yy<ys+h;yy++)
-              {       
-                if (xx>=0 && yy>=0 && xx<current_level->foreground_width() &&
-                    yy<current_level->foreground_height())
-                  the_game->put_fg(xx,yy,raise_all ? make_above_tile(pat[xx-xs+(yy-ys)*w]) : pat[xx-xs+(yy-ys)*w] );
-              }
-            }
-          } break;
-          case 't' :
-          {
-            int32_t xs,ys;
-            the_game->ftile_on(me->x,me->y,xs,ys);
-            dev_cont->fg_fill(-1,xs,ys,this);
-          } break;
-
-        }
+    {
+      case '+' :
+      { if (scale>1)
+        {
+          close_window();
+          scale--;
+          open_window();
+        }
+      } break;
+      case '-' :
+      { if (scale<the_game->ftile_height()/2)
+        {
+          close_window();
+          scale++;
+          open_window();
+        }
+      } break;
+      case JK_LEFT :
+      {
+        if (palettes_locked) the_game->show_help(symbol_str("pal_lock"));
+        else if (w>1) resize(-1,0);
+      } break;
+      case JK_RIGHT :
+      {
+        if (palettes_locked) the_game->show_help(symbol_str("pal_lock"));
+        else
+          resize(1,0);
+      } break;
+      case JK_UP :
+      {
+        if (palettes_locked) the_game->show_help(symbol_str("pal_lock"));
+        else if (h>1) resize(0,-1);
+      } break;
+      case JK_DOWN :
+      {
+        if (palettes_locked)
+          the_game->show_help(symbol_str("pal_lock"));
+        else
+          resize(0,1);
+      } break;
+      case JK_ESC : close_window();     break;
+      case ' ' :
+      {
+        int32_t xs,ys,xx,yy;
+        the_game->ftile_on(me->x,me->y,xs,ys);
+
+        for (xx=xs;xx<xs+w;xx++)
+        {
+          for (yy=ys;yy<ys+h;yy++)
+          {
+        if (xx>=0 && yy>=0 && xx<current_level->foreground_width() &&
+            yy<current_level->foreground_height())
+          the_game->put_fg(xx,yy,raise_all ? make_above_tile(pat[xx-xs+(yy-ys)*w]) : pat[xx-xs+(yy-ys)*w] );
+          }
+        }
+      } break;
+      case 't' :
+      {
+        int32_t xs,ys;
+        the_game->ftile_on(me->x,me->y,xs,ys);
+        dev_cont->fg_fill(-1,xs,ys,this);
+      } break;
+
+    }
       } break;
 
@@ -3229 +3247 @@
 {
   FILE *fp=open_FILE("edit.lsp","w");
-  if (!fp) 
+  if (!fp)
     the_game->show_help(symbol_str("no_edit.lsp"));
   else
   {
     fprintf(fp,"(set_zoom %d)\n",the_game->zoom);
-   
+
     int i;
     for (i=0;i<total_pals;i++)
@@ -3266 +3284 @@
 static int get_color(int color, int x, int y, pal_win *p)
 {
-  if (p)  
+  if (p)
   {
     while (x<0) x+=p->width();
@@ -3302 +3320 @@
         if (fgvalue(above[x])==fcolor)
         { r=new fill_rec(x,y-1,recs);
-          recs=r;  
+          recs=r;
         }
       }
@@ -3323 +3341 @@
           if (x>0 && fgvalue(above[x-1])!=fgvalue(fcolor) && fgvalue(above[x])==fgvalue(fcolor))
           { r=new fill_rec(x,y-1,recs);
-            recs=r;  
+            recs=r;
           }
         }
@@ -3330 +3348 @@
           if (x>0 && fgvalue(below[x-1])!=fgvalue(fcolor) && fgvalue(below[x])==fgvalue(fcolor))
           { r=new fill_rec(x,y+1,recs);
-            recs=r;  
+            recs=r;
           }
         }
@@ -3371 +3389 @@
   }
   if (print)
-    dprintf("\ntotal=%d\n",t);      
+    dprintf("\ntotal=%d\n",t);
   return t;
 }
@@ -3385 +3403 @@
   if (find<0)
     dprintf("No character '%s' defined\n",name);
-  else  
+  else
     get_char_mem(find,1);
-  
+
 }
 
@@ -3400 +3418 @@
       if (cash.loaded(foretiles[i]))
       {
-        t++;      
-        s+=cash.foret(foretiles[i])->size();
+    t++;
+    s+=cash.foret(foretiles[i])->size();
       }
     }
@@ -3414 +3432 @@
       if (cash.loaded(foretiles[i]))
       {
-        t++;
-        s+=cash.backt(backtiles[i])->size();
+    t++;
+    s+=cash.backt(backtiles[i])->size();
       }
     }
   }
   dprintf("%d loaded backtiles=%d bytes\n",t,s);
-  
+
   t=0; s=0;
   for (i=0;i<total_objects;i++)
@@ -3435 +3453 @@
 void dev_cleanup()
 {
-  if (start_edit)  
+  if (start_edit)
     prop->save("defaults.prp");
   delete prop;
@@ -3460 +3478 @@
 static pmi filemenu[]={
           {"menu1_load",         ID_LEVEL_LOAD,NULL,-1},
-          {NULL,0,NULL,-1},
-          {"menu1_save",     ID_LEVEL_SAVE,NULL,-1},
-          {"menu1_saveas",      ID_LEVEL_SAVEAS,NULL,-1},
-          {"menu1_savegame",          ID_GAME_SAVE,NULL,-1},
-          {"menu1_new",          ID_LEVEL_NEW,NULL,-1},
-          {"menu1_resize",         ID_LEVEL_RESIZE,NULL,-1},
-          {NULL,0,NULL,-1},
-          {"menu1_suspend",ID_SUSPEND,NULL,-1},
-          {"menu1_toggle",ID_PLAY_MODE,NULL,-1},
-          {NULL,0,NULL,-1},
-          {"menu1_savepal",ID_EDIT_SAVE,NULL,-1},
-//        {"menu1_startc",ID_CACHE_PROFILE,NULL,-1},
-//        {"menu1_endc",ID_CACHE_PROFILE_END,NULL,-1},
-          {NULL,0,NULL,-1},      
-          {"menu1_quit",      ID_QUIT,NULL,-1},
-          {NULL,-1,NULL,-1}
-        };
+      {NULL,0,NULL,-1},
+      {"menu1_save",     ID_LEVEL_SAVE,NULL,-1},
+      {"menu1_saveas",      ID_LEVEL_SAVEAS,NULL,-1},
+      {"menu1_savegame",          ID_GAME_SAVE,NULL,-1},
+      {"menu1_new",          ID_LEVEL_NEW,NULL,-1},
+      {"menu1_resize",         ID_LEVEL_RESIZE,NULL,-1},
+      {NULL,0,NULL,-1},
+      {"menu1_suspend",ID_SUSPEND,NULL,-1},
+      {"menu1_toggle",ID_PLAY_MODE,NULL,-1},
+      {NULL,0,NULL,-1},
+      {"menu1_savepal",ID_EDIT_SAVE,NULL,-1},
+//      {"menu1_startc",ID_CACHE_PROFILE,NULL,-1},
+//      {"menu1_endc",ID_CACHE_PROFILE_END,NULL,-1},
+      {NULL,0,NULL,-1},
+      {"menu1_quit",      ID_QUIT,NULL,-1},
+      {NULL,-1,NULL,-1}
+    };
 
 
@@ -3496 +3514 @@
   {"menu2_map",      ID_TOGGLE_MAP,NULL,-1},
 //  {"Shrink to 320x200 (F10)",    ID_SMALL_MODE,NULL,-1},
-  {"menu2_view",        ID_DISABLE_VIEW_SHIFT,&view_shift_disabled,-1}, 
+  {"menu2_view",        ID_DISABLE_VIEW_SHIFT,&view_shift_disabled,-1},
 //  {"Ultra Smooth draw (U)",      ID_INTERPOLATE_DRAW,  &interpolate_draw,'U'},
   {"menu2_alight",      ID_DISABLE_AUTOLIGHT, &disable_autolight,'A'},
@@ -3513 +3531 @@
           {"menu3_back",    ID_WIN_BACK,    &backw_on,-1},
           {"menu3_layers",    ID_WIN_LAYERS,  &show_menu_on,-1},
-          {"menu3_light",    ID_WIN_LIGHTING,&ledit_on,-1},
-          {"menu3_pal",    ID_WIN_PALETTES,&pmenu_on,-1},
-          {"menu3_objs",    ID_WIN_OBJECTS, &omenu_on,-1},
-//        {"menu3_console",    ID_WIN_CONSOLE, &commandw_on,-1},
-          {"menu3_toolbar",    ID_WIN_TOOLBAR, &tbw_on,-1},
-//        {"Search      (s)",    ID_SEARCH,      &searchw_on,-1},
-          {"menu3_prof",    ID_PROFILE,     &profile_on,-1},
-          {"menu3_save",     ID_SAVE_WINDOWS,NULL,-1},
-          {NULL,-1,NULL,-1}
-        };
+      {"menu3_light",    ID_WIN_LIGHTING,&ledit_on,-1},
+      {"menu3_pal",    ID_WIN_PALETTES,&pmenu_on,-1},
+      {"menu3_objs",    ID_WIN_OBJECTS, &omenu_on,-1},
+//      {"menu3_console",    ID_WIN_CONSOLE, &commandw_on,-1},
+      {"menu3_toolbar",    ID_WIN_TOOLBAR, &tbw_on,-1},
+//      {"Search      (s)",    ID_SEARCH,      &searchw_on,-1},
+      {"menu3_prof",    ID_PROFILE,     &profile_on,-1},
+      {"menu3_save",     ID_SAVE_WINDOWS,NULL,-1},
+      {NULL,-1,NULL,-1}
+    };
 
 
@@ -3529 +3547 @@
 static pmi filemenu[]={
           {"Load Level",         ID_LEVEL_LOAD,NULL,-1},
-          {NULL,0,NULL,-1},
-          {"Save Level (S)",     ID_LEVEL_SAVE,NULL,-1},
-          {"Save level as",      ID_LEVEL_SAVEAS,NULL,-1},
-          {"Save game",          ID_GAME_SAVE,NULL,-1},
-          {"New level",          ID_LEVEL_NEW,NULL,-1},
-          {"Resize map",         ID_LEVEL_RESIZE,NULL,-1},
-          {NULL,0,NULL,-1},
-          {"Suspend non-players",ID_SUSPEND,NULL,-1},
-          {"Play mode toggle (TAB)",ID_PLAY_MODE,NULL,-1},
-          {NULL,0,NULL,-1},
-          {"Save Palettes         ",ID_EDIT_SAVE,NULL,-1},
-          {"Start cache profile   ",ID_CACHE_PROFILE,NULL,-1},
-          {"End cache profile     ",ID_CACHE_PROFILE_END,NULL,-1},
-          {NULL,0,NULL,-1},      
-          {"Quit      (Q)",      ID_QUIT,NULL,-1},
-          {NULL,-1,NULL,-1}
-        };
+      {NULL,0,NULL,-1},
+      {"Save Level (S)",     ID_LEVEL_SAVE,NULL,-1},
+      {"Save level as",      ID_LEVEL_SAVEAS,NULL,-1},
+      {"Save game",          ID_GAME_SAVE,NULL,-1},
+      {"New level",          ID_LEVEL_NEW,NULL,-1},
+      {"Resize map",         ID_LEVEL_RESIZE,NULL,-1},
+      {NULL,0,NULL,-1},
+      {"Suspend non-players",ID_SUSPEND,NULL,-1},
+      {"Play mode toggle (TAB)",ID_PLAY_MODE,NULL,-1},
+      {NULL,0,NULL,-1},
+      {"Save Palettes         ",ID_EDIT_SAVE,NULL,-1},
+      {"Start cache profile   ",ID_CACHE_PROFILE,NULL,-1},
+      {"End cache profile     ",ID_CACHE_PROFILE_END,NULL,-1},
+      {NULL,0,NULL,-1},
+      {"Quit      (Q)",      ID_QUIT,NULL,-1},
+      {NULL,-1,NULL,-1}
+    };
 
 
@@ -3565 +3583 @@
   {"Toggle map        (m)",      ID_TOGGLE_MAP,NULL,-1},
 //  {"Shrink to 320x200 (F10)",    ID_SMALL_MODE,NULL,-1},
-  {"Disable view shifts",        ID_DISABLE_VIEW_SHIFT,&view_shift_disabled,-1}, 
+  {"Disable view shifts",        ID_DISABLE_VIEW_SHIFT,&view_shift_disabled,-1},
 //  {"Ultra Smooth draw (U)",      ID_INTERPOLATE_DRAW,  &interpolate_draw,'U'},
   {"Disable Autolight (A)",      ID_DISABLE_AUTOLIGHT, &disable_autolight,'A'},
@@ -3582 +3600 @@
           {"Background  (b)",    ID_WIN_BACK,    &backw_on,-1},
           {"Draw layers (L)",    ID_WIN_LAYERS,  &show_menu_on,-1},
-          {"Lighting    (l)",    ID_WIN_LIGHTING,&ledit_on,-1},
-          {"Palettes    (p)",    ID_WIN_PALETTES,&pmenu_on,-1},
-          {"Objects     (o)",    ID_WIN_OBJECTS, &omenu_on,-1},
-          {"Console     (/)",    ID_WIN_CONSOLE, &commandw_on,-1},
-          {"Tool Bar    (a)",    ID_WIN_TOOLBAR, &tbw_on,-1},
-//        {"Search      (s)",    ID_SEARCH,      &searchw_on,-1},
-          {"Profile     (P)",    ID_PROFILE,     &profile_on,-1},
-          {"Save positions",     ID_SAVE_WINDOWS,NULL,-1},
-          {NULL,-1,NULL,-1}
-        };
+      {"Lighting    (l)",    ID_WIN_LIGHTING,&ledit_on,-1},
+      {"Palettes    (p)",    ID_WIN_PALETTES,&pmenu_on,-1},
+      {"Objects     (o)",    ID_WIN_OBJECTS, &omenu_on,-1},
+      {"Console     (/)",    ID_WIN_CONSOLE, &commandw_on,-1},
+      {"Tool Bar    (a)",    ID_WIN_TOOLBAR, &tbw_on,-1},
+//      {"Search      (s)",    ID_SEARCH,      &searchw_on,-1},
+      {"Profile     (P)",    ID_PROFILE,     &profile_on,-1},
+      {"Save positions",     ID_SAVE_WINDOWS,NULL,-1},
+      {NULL,-1,NULL,-1}
+    };
 
 */
-        
+
 static pmenu_item *i_recurse(pmi *first)
 {
   if (first->id==-1)
     return NULL;
-  else  
+  else
     return new pmenu_item(first->id,first->name ? symbol_str(first->name) : 0,first->on_off,first->key,i_recurse(first+1));
 }
-    
+
 static pmenu *make_menu(int x, int y)
 {
   return new pmenu(x,y,
          new pmenu_item(symbol_str("file_top"),new psub_menu(i_recurse(filemenu),NULL),
-         new pmenu_item(symbol_str("edit_top"),new psub_menu(i_recurse(editmenu),NULL),
-         new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(winmenu),NULL),NULL))),screen);
+     new pmenu_item(symbol_str("edit_top"),new psub_menu(i_recurse(editmenu),NULL),
+     new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(winmenu),NULL),NULL))),screen);
 }
 
@@ -3628 +3646 @@
   if ((dev&EDIT_MODE) && !dev_menu)
   {
-    dev_menu=make_menu(0,yres-wm->font()->height()-5);    
+    dev_menu=make_menu(0,yres-wm->font()->height()-5);
   }
   else if (!(dev&EDIT_MODE) && dev_menu)
@@ -3634 +3652 @@
     delete dev_menu;
     dev_menu=NULL;
-  } 
+  }
 }
 

abuse/trunk/src/game.cpp

@@ -1972 +1972 @@
                                         ((button *)ev.message.data)->push();
 /*                                        volume_window->inm->redraw();
-                                        draw_value(volume_window->screen, WINDOW_FRAME_LEFT + 2, WINDOW_FRAME_TOP + 43,
+                                        draw_value(volume_window->screen, 2, 43,
                                                 (volume_window->x2()-volume_window->x1()-1), 8, sfx_volume, 127);
-                                        draw_value(volume_window->screen, WINDOW_FRAME_LEFT + 2, WINDOW_FRAME_TOP + 94,
+                                        draw_value(volume_window->screen, 2, 94,
                                                 (volume_window->x2()-volume_window->x1()-1), 8, music_volume, 127);
 */

abuse/trunk/src/imlib/jwindow.cpp

@@ -405 +405 @@
     l = L >= 0 ? L + left_border() : l - L;
     h = H >= 0 ? H + top_border() : h - H;
-    //if (!f) { l+=WINDOW_FRAME_LEFT; h+=WINDOW_FRAME_TOP; }
     y = Y >= 0 ? Y : yres - h + Y - top_border() - bottom_border() - 1;
     x = X >= 0 ? X : xres - l + X - left_border() - right_border() - 1;

abuse/trunk/src/loadgame.cpp

@@ -204 +204 @@
 /*  int ih=cash.img(save_buts[0])->height();
   ico_button *buts[MAX_SAVE_GAMES];
-  int y=WINDOW_FRAME_TOP;
+  int y=0;
 
 
   for (i=0;i<total_saved;i++,y+=ih)
   {
-    buts[i]=new ico_button(WINDOW_FRAME_LEFT,y,ID_LOAD_GAME_NUMBER+i,                  
+    buts[i]=new ico_button(0,y,ID_LOAD_GAME_NUMBER+i,                  
                            save_buts[i*3+1],save_buts[i*3+1],save_buts[i*3+0],save_buts[i*3+2],NULL);
     buts[i]->set_act_id(ID_LOAD_GAME_PREVIEW+i);

abuse/trunk/src/menu.cpp

@@ -287 +287 @@
 static void create_volume_window()
 {
-/*  int vx=WINDOW_FRAME_LEFT,vy=WINDOW_FRAME_TOP+wm->font()->height()*2,scroller_height=130,bh=wm->font()->height()+5;
+/*  int vx=0,vy=wm->font()->height()*2,scroller_height=130,bh=wm->font()->height()+5;
 
   volume_window=wm->new_window(prop->getd("volume_x",xres/2-20),

abuse/trunk/src/netcfg.cpp

@@ -169 +169 @@
 {
   ifield *ilist=NULL;
-  int x=WINDOW_FRAME_LEFT,y=WINDOW_FRAME_TOP;
+  int x=0,y=0;
   
-  jwindow *sv=wm->new_window(50,80,-1,-1,new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,NET_SERVER,symbol_str("server"),
-                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+wm->font()->height()*2,NET_CLIENT,symbol_str("client"),
-                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+wm->font()->height()*4,NET_SINGLE,symbol_str("single_play"),
-                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+wm->font()->height()*6,NET_CANCEL,symbol_str("cancel_net"),
+  jwindow *sv=wm->new_window(50,80,-1,-1,new button(0,0,NET_SERVER,symbol_str("server"),
+                                     new button(0,wm->font()->height()*2,NET_CLIENT,symbol_str("client"),
+                                     new button(0,wm->font()->height()*4,NET_SINGLE,symbol_str("single_play"),
+                                     new button(0,wm->font()->height()*6,NET_CANCEL,symbol_str("cancel_net"),
                                                 NULL)))),symbol_str("Networking"));
 

abuse/trunk/src/unixnfc.cpp

@@ -487 +487 @@
 
 
-      jwindow *j=wm->new_window(0,yres/2,-1,-1,new info_field(WINDOW_FRAME_LEFT,
-                                                                   WINDOW_FRAME_TOP,
-                                                                   0,"Clients are re-syncing, please wait...",NULL));
+      jwindow *j=wm->new_window(0,yres/2,-1,-1,new info_field(0, 0, 0, "Clients are re-syncing, please wait...",NULL));
       wm->flush_screen();
       if (!reload_start()) return ;
@@ -565 +563 @@
         {
           abort=wm->new_window(0,yres/2,-1,wm->font()->height()*4,
-                               new info_field(WINDOW_FRAME_LEFT,
-                                              WINDOW_FRAME_TOP,
-                                              0,"Waiting for data...",
-                                              new button(WINDOW_FRAME_LEFT,
-                                                         WINDOW_FRAME_TOP+wm->font()->height()+5,ID_NET_DISCONNECT,
+                               new info_field(0, 0, 0,"Waiting for data...",
+                                              new button(0, wm->font()->height()+5,ID_NET_DISCONNECT,
                                                          "Disconnect slackers",NULL)),"Error");   
           wm->flush_screen();