[Pingus-CVS] rev 2335 - in trunk: . data/data src src/editor src/worldobjs

[Ingo Ruhnke]

Author: grumbel
Date: 2004-05-14 18:48:36 +0200 (Fri, 14 May 2004)
New Revision: 2335

Modified:
   trunk/TODO
   trunk/data/data/alias.xml
   trunk/data/data/liquids.xml
   trunk/src/editor/sprite_editorobj.cxx
   trunk/src/editor/surface_selector.cxx
   trunk/src/game_session.cxx
   trunk/src/worldobjs/liquid.cxx
Log:
- some liquid fixes

Modified: trunk/TODO
===================================================================
--- trunk/TODO  2004-05-11 17:14:47 UTC (rev 2334)
+++ trunk/TODO  2004-05-14 16:48:36 UTC (rev 2335)
@@ -1,3 +1,10 @@
+Roadmap for Pingus 0.7.0
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+* split screen multiplayer
+* two new worlds 
+* 
+
 Resource String Cleanup:
 ========================
 Old:
@@ -706,32 +713,5 @@
    throught and things like that, it currently only has horizontal and
    vertical bars, which make building levels quite difficult
 
-Wed Nov 27 19:20:28 2002 - crashes on level exit
-Program received signal SIGSEGV, Segmentation fault.
-[Switching to Thread 16384 (LWP 7072)]
-0x0807b225 in PinguActionFactory::delete_actions() (this=0x88cbbe8)
-    at /usr/include/c++/3.2/bits/stl_iterator.h:593
-593          operator*() const { return *_M_current; }
-Current language:  auto; currently c++
-(gdb) where
-#0  0x0807b225 in PinguActionFactory::delete_actions() (this=0x88cbbe8)
-    at /usr/include/c++/3.2/bits/stl_iterator.h:593
-#1  0x08055bde in ~ActionHolder (this=0x824945c) at action_holder.cxx:48
-#2  0x08090086 in ~Server (this=0x8249450) at server.cxx:53
-#3  0x080a722e in ~TrueServer (this=0x8249450) at true_server.cxx:38
-#4  0x0806e6b9 in ~PingusGameSession (this=0x8248c38)
-    at /usr/include/c++/3.2/bits/basic_string.h:187
-#5  0x0808fe34 in ScreenPtr::decrease_refcount() (this=0x8a6ced0) at 
screen_ptr.cxx:40
-#6  0x0808ee78 in ~ScreenManager (this=0x88cd178) at screen_ptr.hxx:83
-#7  0x0808f8dd in ScreenManager::deinit() () at screen_manager.cxx:252
-#8  0x08080e6e in PingusMain::main(int, char**) (this=0x816a6dc, argc=2, 
argv=0xbffffac4)
-    at pingus_main.cxx:783
-#9  0x401a8d5b in main (argc=2, argv=0xbffffac4) at 
Sources/Application/Unix/clanapp.cpp:32
-(gdb) 
 
-Generic Property Frame for objects
-==================================
-
-
-
 # EOF #
\ No newline at end of file

Modified: trunk/data/data/alias.xml
===================================================================
--- trunk/data/data/alias.xml   2004-05-11 17:14:47 UTC (rev 2334)
+++ trunk/data/data/alias.xml   2004-05-14 16:48:36 UTC (rev 2335)
@@ -507,4 +507,14 @@
 <alias name="pingus/particles/rain1" link="particles/rain1" />
 <alias name="pingus/particles/rain2" link="particles/rain2" />
 
+<alias name="liquids/Liquid/water_cmap" link="liquids/water_cmap" />
+<alias name="liquids/Liquid/water" link="liquids/water" />
+<alias name="liquids/Liquid/water2" link="liquids/water2" />
+<alias name="liquids/Liquid/water3" link="liquids/water3" />
+<alias name="liquids/Liquid/water4" link="liquids/water4" />
+<alias name="liquids/Liquid/water5" link="liquids/water5" />
+<alias name="liquids/Liquid/swater" link="liquids/swater" />
+<alias name="liquids/Liquid/lava" link="liquids/lava" />
+<alias name="liquids/Liquid/slime" link="liquids/slime" />
+
 </resources>

Modified: trunk/data/data/liquids.xml
===================================================================
--- trunk/data/data/liquids.xml 2004-05-11 17:14:47 UTC (rev 2334)
+++ trunk/data/data/liquids.xml 2004-05-14 16:48:36 UTC (rev 2335)
@@ -10,9 +10,10 @@
       </image>
     </sprite>
     <sprite name="water2">
+      <animation speed="130" />
       <image file="../images/liquids/water2.png">
-        <grid pos="0,0" size="64,64" array="12,1"/>
-      </image>
+        <grid pos="0,0" size="64,64" array="8,1"/>
+      </image>-->
     </sprite>
     <sprite name="water3">
       <image file="../images/liquids/water3.png">

Modified: trunk/src/editor/sprite_editorobj.cxx
===================================================================
--- trunk/src/editor/sprite_editorobj.cxx       2004-05-11 17:14:47 UTC (rev 
2334)
+++ trunk/src/editor/sprite_editorobj.cxx       2004-05-14 16:48:36 UTC (rev 
2335)
@@ -115,7 +115,7 @@
   if (RectEditorObj::is_over (pos))
     {
 #if 0 // EDITOR_PIXEL_PERFECT_IS_OVER
-      CL_PixelBuffer* provider = sprite.get_surface ().get_provider ();
+      CL_PixelBuffer provider = sprite.get_surface ().get_pixeldata();
       if (provider)
         {
           // Position relative to the surface, not world
@@ -132,7 +132,7 @@
           provider_pos_y = Math::mid(0, provider_pos_y, 
int(provider->get_height()-1));
 
           float r, g, b, a;
-          provider->get_pixel (int(provider_pos_x), int(provider_pos_y), &r, 
&g, &b, &a);
+          provider->get_pixel(int(provider_pos_x), int(provider_pos_y), &r, 
&g, &b, &a);
           return (a > 0.0f);
         }
       else

Modified: trunk/src/editor/surface_selector.cxx
===================================================================
--- trunk/src/editor/surface_selector.cxx       2004-05-11 17:14:47 UTC (rev 
2334)
+++ trunk/src/editor/surface_selector.cxx       2004-05-14 16:48:36 UTC (rev 
2335)
@@ -125,7 +125,6 @@
   //CL_Display::get_width(), y+1/10,
   //1.0, 1.0, 1.0, 1.0);
 
-#ifdef CLANLIB_0_6
   // Draw the current object in the bottom/left corner when the
   // surface is selected for more then 1sec
   if (c_obj != std::vector<surface_obj>::iterator()
@@ -137,12 +136,11 @@
          c_obj->large_sur = Resource::load_surface (c_obj->name, 
c_obj->datafile);
        }
 
-      CL_Display::fill_rect(0, CL_Display::get_height() - 
c_obj->large_sur.get_height(),
-                           c_obj->large_sur.get_width(), 
CL_Display::get_height(),
-                           0.5f, 0.5f, 0.5f, 0.8f);
+      CL_Display::fill_rect(CL_Rect(0, CL_Display::get_height() - 
c_obj->large_sur.get_height(),
+                                    c_obj->large_sur.get_width(), 
CL_Display::get_height()),
+                           CL_Color(128, 128, 128, 160));
       c_obj->large_sur.draw(0, CL_Display::get_height() - 
c_obj->large_sur.get_height());
     }
-#endif
 
   Display::flip_display();
 }

Modified: trunk/src/game_session.cxx
===================================================================
--- trunk/src/game_session.cxx  2004-05-11 17:14:47 UTC (rev 2334)
+++ trunk/src/game_session.cxx  2004-05-14 16:48:36 UTC (rev 2335)
@@ -167,12 +167,6 @@
 
   // Client is independend of the update limit, well, not completly...
   client->update (delta);
-
-#if 0
-  // Move the game one loop further
-  server->update ();
-  client->update (delta);
-#endif
 }
 
 void

Modified: trunk/src/worldobjs/liquid.cxx
===================================================================
--- trunk/src/worldobjs/liquid.cxx      2004-05-11 17:14:47 UTC (rev 2334)
+++ trunk/src/worldobjs/liquid.cxx      2004-05-14 16:48:36 UTC (rev 2335)
@@ -72,7 +72,7 @@
 void
 Liquid::update()
 {
-  sur.update();
+  sur.update(0.033f); 
 }
 
 } // namespace WorldObjs