[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] [pingus] 4 new revisions pushed by address@hidden on 2011-1
|
From: |
pingus |
|
Subject: |
[Pingus-CVS] [pingus] 4 new revisions pushed by address@hidden on 2011-10-18 02:47 GMT |
|
Date: |
Tue, 18 Oct 2011 02:48:31 +0000 |
4 new revisions:
Revision: a5fb86d67512
Author: Ingo Ruhnke <address@hidden>
Date: Mon Oct 17 19:04:46 2011
Log: Increased version number to 0.7.5
http://code.google.com/p/pingus/source/detail?r=a5fb86d67512
Revision: d7198c838313
Author: Ingo Ruhnke <address@hidden>
Date: Mon Oct 17 19:09:24 2011
Log: Read version number from VERSION file
http://code.google.com/p/pingus/source/detail?r=d7198c838313
Revision: 941cc20843ae
Author: Ingo Ruhnke <address@hidden>
Date: Mon Oct 17 19:21:08 2011
Log: Manually define 'WIN32' define, as mingw doesn't seem to do that
autom...
http://code.google.com/p/pingus/source/detail?r=941cc20843ae
Revision: 13342ee99721
Author: Ingo Ruhnke <address@hidden>
Date: Mon Oct 17 19:45:58 2011
Log: Removed obsolete RocketLauncher code
http://code.google.com/p/pingus/source/detail?r=13342ee99721
==============================================================================
Revision: a5fb86d67512
Author: Ingo Ruhnke <address@hidden>
Date: Mon Oct 17 19:04:46 2011
Log: Increased version number to 0.7.5
http://code.google.com/p/pingus/source/detail?r=a5fb86d67512
Modified:
/VERSION
=======================================
--- /VERSION Mon Oct 3 13:20:12 2011
+++ /VERSION Mon Oct 17 19:04:46 2011
@@ -1,1 +1,1 @@
-0.7.4
+0.7.5
==============================================================================
Revision: d7198c838313
Author: Ingo Ruhnke <address@hidden>
Date: Mon Oct 17 19:09:24 2011
Log: Read version number from VERSION file
http://code.google.com/p/pingus/source/detail?r=d7198c838313
Modified:
/SConscript
/SConscript.win32
/SConstruct
/SConstruct.win32
=======================================
--- /SConscript Wed Sep 28 07:40:21 2011
+++ /SConscript Mon Oct 17 19:09:24 2011
@@ -19,6 +19,8 @@
import sys, os
import SCons.Util
+
+Import('package_version')
def CheckSDLLib(context, sdllib):
"""
@@ -107,18 +109,11 @@
self.env = Environment(options = self.opts, ENV=os.environ)
self.env.Append(CXXFLAGS = ["-std=c++0x"])
- self.env.Append(CPPDEFINES = [('VERSION', '"\\"0.7.4\\""')])
+ self.env.Append(CPPDEFINES = [('VERSION', '"\\"%s\\""' %
package_version)])
+ self.env.Append(CPPPATH = ['src/'])
+
Help(self.opts.GenerateHelpText(self.env))
-
- if os.environ.has_key('PATH'):
- self.env['ENV']['PATH'] = os.environ['PATH']
- if os.environ.has_key('HOME'):
- self.env['ENV']['HOME'] = os.environ['HOME']
-
- if os.environ.has_key('PKG_CONFIG_PATH'):
- self.env['ENV']['PKG_CONFIG_PATH'] =
os.environ['PKG_CONFIG_PATH']
-
- self.env.Append(CPPPATH = ['.', 'src/'])
+
self.conf = self.env.Configure(custom_tests = {
'CheckMyProgram' : CheckMyProgram,
=======================================
--- /SConscript.win32 Fri Oct 14 08:52:27 2011
+++ /SConscript.win32 Mon Oct 17 19:09:24 2011
@@ -1,3 +1,5 @@
+Import('package_version')
+
env = Environment(PATH="/home/ingo/projects/mingw32/run/bin:$PATH",
PKG_CONFIG_LIBDIR="/home/ingo/projects/mingw32/run/lib/pkgconfig:/home/ingo/projects/mingw32/run/opt/gtk/lib/pkgconfig",
CXXFLAGS=["-O3", "-s", "-std=c++0x"],
@@ -49,7 +51,7 @@
Glob('src/util/*.cpp') + \
Glob('src/win32/*.cpp')
-env.Append(CPPDEFINES=[('VERSION', '"\\"0.7.4\\""'), 'WIN32'])
+env.Append(CPPDEFINES = [('VERSION', '"\\"%s\\""' % package_version)])
env.Append(CPPPATH=['external/tinygettext'])
env.Program("pingus", pingus_sources)
=======================================
--- /SConstruct Wed Nov 4 17:40:25 2009
+++ /SConstruct Mon Oct 17 19:09:24 2011
@@ -1,5 +1,11 @@
# -*- mode: python -*-
+import os
+
+with open("VERSION", "r") as fin:
+ package_version = fin.readline().strip()
+
+Export("package_version")
SConscript('SConscript', variant_dir='build', duplicate=0)
# EOF #
=======================================
--- /SConstruct.win32 Tue Oct 11 14:42:55 2011
+++ /SConstruct.win32 Mon Oct 17 19:09:24 2011
@@ -1,5 +1,11 @@
CacheDir('cache')
+import os
+
+with open("VERSION", "r") as fin:
+ package_version = fin.readline().strip()
+
+Export("package_version")
SConscript('SConscript.win32', variant_dir='build-win32', duplicate=0)
# EOF #
==============================================================================
Revision: 941cc20843ae
Author: Ingo Ruhnke <address@hidden>
Date: Mon Oct 17 19:21:08 2011
Log: Manually define 'WIN32' define, as mingw doesn't seem to do that
automatically any more
http://code.google.com/p/pingus/source/detail?r=941cc20843ae
Modified:
/SConscript.win32
=======================================
--- /SConscript.win32 Mon Oct 17 19:09:24 2011
+++ /SConscript.win32 Mon Oct 17 19:21:08 2011
@@ -51,7 +51,7 @@
Glob('src/util/*.cpp') + \
Glob('src/win32/*.cpp')
-env.Append(CPPDEFINES = [('VERSION', '"\\"%s\\""' % package_version)])
+env.Append(CPPDEFINES = ['WIN32', ('VERSION', '"\\"%s\\""' %
package_version)])
env.Append(CPPPATH=['external/tinygettext'])
env.Program("pingus", pingus_sources)
==============================================================================
Revision: 13342ee99721
Author: Ingo Ruhnke <address@hidden>
Date: Mon Oct 17 19:45:58 2011
Log: Removed obsolete RocketLauncher code
http://code.google.com/p/pingus/source/detail?r=13342ee99721
Deleted:
/src/pingus/actions/rocket_launcher.cpp
/src/pingus/actions/rocket_launcher.hpp
/src/pingus/particles/explosive_particle.cpp
/src/pingus/particles/explosive_particle.hpp
Modified:
/src/pingus/action_name.cpp
/src/pingus/action_name.hpp
/src/pingus/pingu.cpp
/src/pingus/worldobj.cpp
/src/pingus/worldobj.hpp
=======================================
--- /src/pingus/actions/rocket_launcher.cpp Sat Nov 7 16:27:52 2009
+++ /dev/null
@@ -1,63 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#include "pingus/actions/rocket_launcher.hpp"
-
-#include "engine/display/scene_context.hpp"
-#include "pingus/pingu.hpp"
-
-namespace Actions {
-
-RocketLauncher::RocketLauncher (Pingu* p) :
- PinguAction(p),
- sprite(),
- launched(false)
-{
- sprite.load(Direction::LEFT, "pingus/player" + pingu->get_owner_str() +
- "/rocketlauncher/left");
- sprite.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() +
- "/rocketlauncher/right");
-
- /* Explosive Particles not supported right now
- WorldObj::get_world()->get_particle_holder()->add_particle
- (new ExplosiveParticle (static_cast<int>(pingu->get_x()),
- static_cast<int>(pingu->get_y()) - 12,
- pingu->direction.is_left() ? -400.0f : 400.0f,
- 0.0f));
- */
-}
-
-void
-RocketLauncher::update ()
-{
- if (sprite[pingu->direction].is_finished())
- {
- pingu->set_action(ActionName::WALKER);
- return;
- }
-
- sprite.update();
-}
-
-void
-RocketLauncher::draw (SceneContext& gc)
-{
- gc.color().draw(sprite[pingu->direction], pingu->get_pos());
-}
-
-} // namespace Actions
-
-/* EOF */
=======================================
--- /src/pingus/actions/rocket_launcher.hpp Sat Nov 7 16:27:52 2009
+++ /dev/null
@@ -1,48 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef HEADER_PINGUS_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
-#define HEADER_PINGUS_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
-
-#include "pingus/pingu_action.hpp"
-#include "pingus/state_sprite.hpp"
-
-namespace Actions {
-
-class RocketLauncher : public PinguAction
-{
-private:
- StateSprite sprite;
- bool launched;
-public:
- RocketLauncher(Pingu*);
- ~RocketLauncher() {}
-
- ActionName::Enum get_type () const { return ActionName::ROCKETLAUNCHER; }
-
- void draw (SceneContext& gc);
- void update ();
-
-private:
- RocketLauncher (const RocketLauncher&);
- RocketLauncher& operator= (const RocketLauncher&);
-};
-
-} // namespace Actions
-
-#endif
-
-/* EOF */
=======================================
--- /src/pingus/particles/explosive_particle.cpp Mon Aug 29 15:39:06 2011
+++ /dev/null
@@ -1,92 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#if 0
-#include "pingus/collision_map.hpp"
-#include "pingus/particles/particle_holder.hpp"
-#include "pingus/pingu_map.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/world.hpp"
-
-ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
- : Particle (x, y, x_a, y_a),
- alive (true)
-{
-}
-
-ExplosiveParticle::~ExplosiveParticle ()
-{
-}
-
-void
-ExplosiveParticle::update (float delta)
-{
- Vector new_pos = pos + velocity * delta;
-
- Vector incr = pos - new_pos;
- incr.normalize ();
-
- // FIXME: This thing needs to be more abstract, we just need it far
- // to often to reimplement it over and over again.
- while ( static_cast<int>(new_pos.x) != static_cast<int>(pos.x)
- || static_cast<int>(new_pos.y) != static_cast<int>(pos.y))
- {
- pos -= incr;
-
- if ( pos.x < 0
- || pos.y < 0
- || pos.x + 1 > WorldObj::get_world()->get_width ()
- || pos.y + 1 > WorldObj::get_world()->get_height())
- {
- alive = false;
- return;
- }
-
- if
(WorldObj::get_world()->get_colmap()->getpixel(static_cast<int>(pos.x),
static_cast<int>(pos.y)))
- {
- detonate();
- }
- }
-
- pos = new_pos;
-}
-
-void
-ExplosiveParticle::detonate ()
-{
- alive = false;
- WorldObj::get_world()->get_particle_holder
()->add_pingu_explo((int)pos.x, (int)pos.y);
-
- CollisionMask mask("Other/bomber_radius", "pingus");
- WorldObj::get_world()->remove(mask,
- int(pos.x) - (bomber_radius.get_width()/2),
- int(pos.y) -
(bomber_radius.get_height()/2));
-}
-
-//void
-//ExplosiveParticle::draw_offset(int ofx, int ofy, float /*s*/)
-//{
-// sprite.put_screen (int(pos.x + ofx), int(pos.y + ofy));
-//}
-
-bool
-ExplosiveParticle::is_alive(void)
-{
- return alive;
-}
-
-/* EOF */
-#endif
=======================================
--- /src/pingus/particles/explosive_particle.hpp Mon Aug 29 15:39:06 2011
+++ /dev/null
@@ -1,46 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#if 0
-#ifndef HEADER_PINGUS_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
-#define HEADER_PINGUS_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
-
-#include "pingus/particles/particle.hpp"
-
-class ExplosiveParticle : public Particle
-{
-private:
- bool alive;
-
-public:
- ExplosiveParticle (int x, int y, float x_a, float y_a);
- ~ExplosiveParticle ();
- ///
- void update(float delta);
- ///
- //void draw_offset(int ofx, int ofy, float s);
- ///
- bool is_alive(void);
- void detonate ();
-
-private:
- ExplosiveParticle (const ExplosiveParticle&);
- ExplosiveParticle& operator= (const ExplosiveParticle&);
-};
-
-#endif
-
-/* EOF */
-#endif
=======================================
--- /src/pingus/action_name.cpp Sat Nov 7 16:37:04 2009
+++ /src/pingus/action_name.cpp Mon Oct 17 19:45:58 2011
@@ -39,7 +39,6 @@
case JUMPER : return _("Jumper");
case LASERKILL : return _("Laserkill");
case MINER : return _("Miner");
- case ROCKETLAUNCHER : return _("Rocketlauncher");
case SLIDER : return _("Slider");
case SMASHED : return _("Smashed");
case SPLASHED : return _("Splashed");
@@ -70,7 +69,6 @@
case JUMPER : return "jumper";
case LASERKILL : return "laserkill";
case MINER : return "miner";
- case ROCKETLAUNCHER : return "rocketlauncher";
case SLIDER : return "slider";
case SMASHED : return "smashed";
case SPLASHED : return "splashed";
@@ -99,7 +97,6 @@
if (action == "jumper") return JUMPER;
if (action == "laserkill") return LASERKILL;
if (action == "miner") return MINER;
- if (action == "rocketlauncher") return ROCKETLAUNCHER;
if (action == "slider") return SLIDER;
if (action == "smashed") return SMASHED;
if (action == "splashed") return SPLASHED;
=======================================
--- /src/pingus/action_name.hpp Sat Nov 7 16:37:04 2009
+++ /src/pingus/action_name.hpp Mon Oct 17 19:45:58 2011
@@ -41,7 +41,6 @@
JUMPER,
LASERKILL,
MINER,
- ROCKETLAUNCHER,
SLIDER,
SMASHED,
SPLASHED,
=======================================
--- /src/pingus/pingu.cpp Tue Oct 11 07:55:43 2011
+++ /src/pingus/pingu.cpp Mon Oct 17 19:45:58 2011
@@ -41,7 +41,6 @@
#include "pingus/actions/jumper.hpp"
#include "pingus/actions/laser_kill.hpp"
#include "pingus/actions/miner.hpp"
-#include "pingus/actions/rocket_launcher.hpp"
#include "pingus/actions/slider.hpp"
#include "pingus/actions/smashed.hpp"
#include "pingus/actions/splashed.hpp"
@@ -466,7 +465,6 @@
case ActionName::JUMPER: return std::make_shared<Jumper>(this);
case ActionName::LASERKILL: return std::make_shared<LaserKill>(this);
case ActionName::MINER: return std::make_shared<Miner>(this);
- case ActionName::ROCKETLAUNCHER: return
std::make_shared<RocketLauncher>(this);
case ActionName::SLIDER: return std::make_shared<Slider>(this);
case ActionName::SMASHED: return std::make_shared<Smashed>(this);
case ActionName::SPLASHED: return std::make_shared<Splashed>(this);
=======================================
--- /src/pingus/worldobj.cpp Mon Sep 5 14:46:01 2011
+++ /src/pingus/worldobj.cpp Mon Oct 17 19:45:58 2011
@@ -54,31 +54,10 @@
{
// do nothing
}
-
-void
-WorldObj::draw_offset(int /*x*/, int /*y*/, float /*s*/)
-{
- // do nothing
- log_error("WorldObj::draw_offset(): not implemented, probally a bug: "
- << typeid(*this).name ());
-}
void
WorldObj::draw_smallmap(SmallMap* smallmap)
{
}
-
-void
-WorldObj::draw (SceneContext& gc)
-{
- // FIXME: I need some docu on the meaning of get_x_offset() and co.
- log_error("WorldObj:draw(SceneContext): Using compat-wrapper: "
- << typeid(*this).name ());
-#if 0 // FIXME:
- draw_offset (static_cast<int>(gc.get_x_offset () + gc.get_width ()/2),
- static_cast<int>(gc.get_y_offset () + gc.get_height ()/2),
- gc.get_zoom ());
-#endif
-}
/* EOF */
=======================================
--- /src/pingus/worldobj.hpp Sun Sep 11 04:18:13 2011
+++ /src/pingus/worldobj.hpp Mon Oct 17 19:45:58 2011
@@ -66,17 +66,8 @@
virtual void set_pos(const Vector3f& p) = 0;
virtual Vector3f get_pos() const = 0;
- /** Draws this WorldObject on the screen with the specified offset. If
not
- * overloaded, this method does nothing.
- * (XXX: What are the bounds of this offset?)
- * @param x the $x$-coordinate of this object
- * @param y the $y$-coordinate of this object
- * @param s the scalar by with the object is zoomed (1.0 is default)
- */
- virtual void draw_offset (int x, int y, float s = 1.0);
-
/** Draw the WorldObj to the given SceneContext */
- virtual void draw(SceneContext& gc);
+ virtual void draw(SceneContext& gc) = 0;
virtual void draw_smallmap(SmallMap* smallmap);
/** Draws the objects collision map to the main collision map, draws
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] [pingus] 4 new revisions pushed by address@hidden on 2011-10-18 02:47 GMT,
pingus <=