[Enigma-cvs] enigma/src display.cc,1.39,1.40

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv9276/src

Modified Files:
        display.cc 
Log Message:
Removed effect sprite limit


Index: display.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/display.cc,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** display.cc  20 Nov 2003 20:22:34 -0000      1.39
--- display.cc  21 Nov 2003 09:27:01 -0000      1.40
***************
*** 998,1004 ****
  }
  
! void
! StoneShadowCache::release (StoneShadow *s)
! {
      if (s->in_cache) {
          // Image is in cache, no need to free anything
--- 998,1002 ----
  }
  
! void StoneShadowCache::release (StoneShadow *s) {
      if (s->in_cache) {
          // Image is in cache, no need to free anything
***************
*** 1064,1069 ****
  }
  
! DL_Shadows::~DL_Shadows()
! {
      delete m_cache;
      delete buffer;
--- 1062,1066 ----
  }
  
! DL_Shadows::~DL_Shadows() {
      delete m_cache;
      delete buffer;
***************
*** 1074,1080 ****
  }
  
! void
! DL_Shadows::draw (px::GC &gc, const WorldArea &a, int destx, int desty)
! {
      int x2 = a.x+a.w;
      int y2 = a.y+a.h;
--- 1071,1075 ----
  }
  
! void DL_Shadows::draw (px::GC &gc, const WorldArea &a, int destx, int desty) {
      int x2 = a.x+a.w;
      int y2 = a.y+a.h;
***************
*** 1092,1098 ****
  }
  
! bool
! DL_Shadows::has_actor (int x, int y)
! {
      // Is any actor at least partially inside this field?
      for (unsigned i=0; i<m_sprites->sprites.size(); ++i) {
--- 1087,1091 ----
  }
  
! bool DL_Shadows::has_actor (int x, int y) {
      // Is any actor at least partially inside this field?
      for (unsigned i=0; i<m_sprites->sprites.size(); ++i) {
***************
*** 1289,1303 ****
  {}
  
! void
! Follower_Scrolling::center(const px::V2 &point)
! {
      Follower::center(point);
      curpos = destpos = get_engine()->get_offset();
  }
  
! 
! void
! Follower_Scrolling::tick(double dtime, const px::V2 &point)
! {
      DisplayEngine *engine   = get_engine();
      ScreenArea     gamearea = engine->get_area();
--- 1282,1291 ----
  {}
  
! void Follower_Scrolling::center(const px::V2 &point) {
      Follower::center(point);
      curpos = destpos = get_engine()->get_offset();
  }
  
! void Follower_Scrolling::tick(double dtime, const px::V2 &point) {
      DisplayEngine *engine   = get_engine();
      ScreenArea     gamearea = engine->get_area();
***************
*** 1369,1373 ****
      engine->add_layer (line_layer = new DL_Lines);
      engine->add_layer (effects_layer = new DL_Sprites);
!     effects_layer->set_maxsprites(10);
  
      m_engine = engine;
--- 1357,1361 ----
      engine->add_layer (line_layer = new DL_Lines);
      engine->add_layer (effects_layer = new DL_Sprites);
! //    effects_layer->set_maxsprites(10);
  
      m_engine = engine;
***************
*** 1453,1475 ****
  }
  
- 
  void CommonDisplay::set_floor (int x, int y, Model *m) {
      floor_layer->set_model (x, y, m);
  }
  
! void
! CommonDisplay::set_item (int x, int y, Model *m)
! {
      item_layer->set_model (x,y , m);
  }
  
! void
! CommonDisplay::set_stone (int x, int y, Model *m)
! {
      stone_layer->set_model (x,y , m);
  }
  
  
- 
  
  //----------------------------------------------------------------------
--- 1441,1457 ----
  }
  
  void CommonDisplay::set_floor (int x, int y, Model *m) {
      floor_layer->set_model (x, y, m);
  }
  
! void CommonDisplay::set_item (int x, int y, Model *m) {
      item_layer->set_model (x,y , m);
  }
  
! void CommonDisplay::set_stone (int x, int y, Model *m) {
      stone_layer->set_model (x,y , m);
  }
  
  
  
  //----------------------------------------------------------------------
***************
*** 1494,1500 ****
  }
  
! void
! GameDisplay::tick(double dtime)
! {
      get_engine()->tick (dtime);
      status_bar->tick (dtime);
--- 1476,1480 ----
  }
  
! void GameDisplay::tick(double dtime) {
      get_engine()->tick (dtime);
      status_bar->tick (dtime);
***************
*** 1504,1510 ****
  }
  
! void
! GameDisplay::new_world (int w, int h)
! {
      CommonDisplay::new_world (w, h);
      status_bar->new_world();
--- 1484,1488 ----
  }
  
! void GameDisplay::new_world (int w, int h) {
      CommonDisplay::new_world (w, h);
      status_bar->new_world();
***************
*** 1557,1563 ****
  //----------------------------------------
  
! void
! GameDisplay::redraw_all (Screen *scr)
! {
      get_engine()->mark_redraw_screen();
      redraw_everything = true;
--- 1535,1539 ----
  //----------------------------------------
  
! void GameDisplay::redraw_all (Screen *scr) {
      get_engine()->mark_redraw_screen();
      redraw_everything = true;
***************
*** 1566,1571 ****
  }
  
! void GameDisplay::redraw(px::Screen *screen)
! {
      GC gc(screen->get_surface());
      CommonDisplay::redraw();
--- 1542,1546 ----
  }
  
! void GameDisplay::redraw (px::Screen *screen) {
      GC gc(screen->get_surface());
      CommonDisplay::redraw();
***************
*** 1594,1599 ****
  }
  
! void GameDisplay::draw_all (GC &gc)
! {
      get_engine()->draw_all(gc);
      status_bar->redraw (gc, inventoryarea);
--- 1569,1573 ----
  }
  
! void GameDisplay::draw_all (GC &gc) {
      get_engine()->draw_all(gc);
      status_bar->redraw (gc, inventoryarea);
***************
*** 1601,1607 ****
  }
  
! void
! GameDisplay::draw_borders (GC &gc)
! {
      RectList rl;
      rl.push_back (gc.drawable->size());
--- 1575,1579 ----
  }
  
! void GameDisplay::draw_borders (GC &gc) {
      RectList rl;
      rl.push_back (gc.drawable->size());
***************
*** 1615,1620 ****
  }
  
! void GameDisplay::resize_game_area (int w, int h)
! {
      DisplayEngine *e = get_engine();
      int neww = w * e->get_tilew();
--- 1587,1591 ----
  }
  
! void GameDisplay::resize_game_area (int w, int h) {
      DisplayEngine *e = get_engine();
      int neww = w * e->get_tilew();
***************
*** 1635,1641 ****
  
  
! //----------------------------------------------------------------------
! // GLOBAL FUNCTIONS
! //----------------------------------------------------------------------
  
  void display::Init() {
--- 1606,1610 ----
  
  
! /* -------------------- Global functions -------------------- */
  
  void display::Init() {