[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: adonthell/src main.cc,1.39.2.25,1.39.2.26 Makef
|
From: |
Alexandre Courbot <address@hidden> |
|
Subject: |
[Adonthell-commits] CVS: adonthell/src main.cc,1.39.2.25,1.39.2.26 Makefile.am,1.80.2.33,1.80.2.34 |
|
Date: |
Mon, 01 Jul 2002 15:46:51 -0400 |
Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv9595/src
Modified Files:
Tag: Branch_road_to_0-4
main.cc Makefile.am
Log Message:
Now compiles well with GCC 2.95 as well.
Index: main.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/main.cc,v
retrieving revision 1.39.2.25
retrieving revision 1.39.2.26
diff -C2 -r1.39.2.25 -r1.39.2.26
*** main.cc 30 Jun 2002 19:01:01 -0000 1.39.2.25
--- main.cc 1 Jul 2002 19:46:49 -0000 1.39.2.26
***************
*** 1,3 ****
! #include "map/landmap.h"
#include "gfx/animation.h"
#include "gametime.h"
--- 1,3 ----
! #include "lmap/landmap.h"
#include "gfx/animation.h"
#include "gametime.h"
***************
*** 7,13 ****
{
public:
! map::landmap lmap;
! map::character_with_gfx * mchar;
! map::character_with_gfx * mchar2;
bool letsexit;
bool draw_grid;
--- 7,13 ----
{
public:
! lmap::landmap lmap;
! lmap::character_with_gfx * mchar;
! lmap::character_with_gfx * mchar2;
bool letsexit;
bool draw_grid;
***************
*** 147,151 ****
// Adding the map characters
! mchar = (map::character_with_gfx *)lmap.add_character();
mchar->load("adontest/chrono.mdl");
mchar->set_speed(1.0);
--- 147,151 ----
// Adding the map characters
! mchar = (lmap::character_with_gfx *)lmap.add_character();
mchar->load("adontest/chrono.mdl");
mchar->set_speed(1.0);
***************
*** 154,188 ****
// Quick fix for the character size.
! for (map::placeable::iterator it = mchar->begin(); it !=
mchar->end(); ++it)
it->second.zsize += 5;
// Adding map objects
! map::object_with_gfx * mobj;
! mobj = (map::object_with_gfx *)lmap.add_object();
mobj->load("adontest/tree.mobj");
! mobj = (map::object_with_gfx *)lmap.add_object();
mobj->load("adontest/sandy.mobj");
! mobj = (map::object_with_gfx *)lmap.add_object();
mobj->load("adontest/rug.mobj");
! mobj = (map::object_with_gfx *)lmap.add_object();
mobj->load("adontest/platform.mobj");
! mobj = (map::object_with_gfx *)lmap.add_object();
mobj->load("adontest/pillar_l.mobj");
! mobj = (map::object_with_gfx *)lmap.add_object();
mobj->load("adontest/pillar_r.mobj");
! map::coordinates mc;
for (int i = 0; i < lmap.length(); i++)
for (int j = 0; j < lmap.height(); j++)
{
! map::coordinates mc(i, j, 0, 0, 0);
lmap.put_object(1, mc);
}
--- 154,188 ----
// Quick fix for the character size.
! for (lmap::placeable::iterator it = mchar->begin(); it !=
mchar->end(); ++it)
it->second.zsize += 5;
// Adding map objects
! lmap::object_with_gfx * mobj;
! mobj = (lmap::object_with_gfx *)lmap.add_object();
mobj->load("adontest/tree.mobj");
! mobj = (lmap::object_with_gfx *)lmap.add_object();
mobj->load("adontest/sandy.mobj");
! mobj = (lmap::object_with_gfx *)lmap.add_object();
mobj->load("adontest/rug.mobj");
! mobj = (lmap::object_with_gfx *)lmap.add_object();
mobj->load("adontest/platform.mobj");
! mobj = (lmap::object_with_gfx *)lmap.add_object();
mobj->load("adontest/pillar_l.mobj");
! mobj = (lmap::object_with_gfx *)lmap.add_object();
mobj->load("adontest/pillar_r.mobj");
! lmap::coordinates mc;
for (int i = 0; i < lmap.length(); i++)
for (int j = 0; j < lmap.height(); j++)
{
! lmap::coordinates mc(i, j, 0, 0, 0);
lmap.put_object(1, mc);
}
***************
*** 200,204 ****
for (int j = 4; j < 6; j++)
{
! map::coordinates mc(i, j, 40);
lmap.put_object(3, mc);
}
--- 200,204 ----
for (int j = 4; j < 6; j++)
{
! lmap::coordinates mc(i, j, 40);
lmap.put_object(3, mc);
}
***************
*** 228,232 ****
for (int j = 4; j < 7; j++)
{
! map::coordinates mc(i, j, 80);
lmap.put_object(3, mc);
}
--- 228,232 ----
for (int j = 4; j < 7; j++)
{
! lmap::coordinates mc(i, j, 80);
lmap.put_object(3, mc);
}
***************
*** 234,238 ****
for (int i = 0; i < 13; i++)
{
! map::coordinates mc(i + 1, 9, 5 * (i + 1));
lmap.put_object(3, mc);
}
--- 234,238 ----
for (int i = 0; i < 13; i++)
{
! lmap::coordinates mc(i + 1, 9, 5 * (i + 1));
lmap.put_object(3, mc);
}
***************
*** 293,297 ****
}
! std::list <map::square_info> drawqueue;
// Rendering phase
--- 293,297 ----
}
! std::list <lmap::square_info> drawqueue;
// Rendering phase
***************
*** 301,306 ****
for (i = 0; i < gc.lmap.length (); i++)
{
! map::square * sq = gc.lmap.get (i, j);
! map::square::iterator it = sq->end();
while (it != sq->begin())
{
--- 301,306 ----
for (i = 0; i < gc.lmap.length (); i++)
{
! lmap::square * sq = gc.lmap.get (i, j);
! lmap::square::iterator it = sq->end();
while (it != sq->begin())
{
***************
*** 330,348 ****
drawqueue.sort();
! for (std::list <map::square_info>::iterator it = drawqueue.begin ();
it != drawqueue.end (); it++)
{
switch ((*it).obj->type ())
{
! case map::CHARACTER:
! ((map::character_with_gfx *)
! (*it).obj)->draw ((*it).x () * map::square_size +
(*it).ox (),
! (*it).y () * map::square_size +
(*it).oy ());
break;
! case map::OBJECT:
! ((map::object_with_gfx *)
! (*it).obj)->draw ((*it).x () * map::square_size +
(*it).ox (),
! (*it).y () * map::square_size +
(*it).oy () - (*it).z());
break;
--- 330,348 ----
drawqueue.sort();
! for (std::list <lmap::square_info>::iterator it = drawqueue.begin ();
it != drawqueue.end (); it++)
{
switch ((*it).obj->type ())
{
! case lmap::CHARACTER:
! ((lmap::character_with_gfx *)
! (*it).obj)->draw ((*it).x () * lmap::square_size +
(*it).ox (),
! (*it).y () * lmap::square_size +
(*it).oy ());
break;
! case lmap::OBJECT:
! ((lmap::object_with_gfx *)
! (*it).obj)->draw ((*it).x () * lmap::square_size +
(*it).ox (),
! (*it).y () * lmap::square_size +
(*it).oy () - (*it).z());
break;
***************
*** 358,364 ****
if (gc.draw_grid)
{
! for (i = 0; i < gfx::screen::length (); i += map::square_size)
gfx::screen::display.fillrect (i, 0, 1, gfx::screen::height
(), 0xFFFF00);
! for (i = 0; i < gfx::screen::height (); i += map::square_size)
gfx::screen::display.fillrect (0, i, gfx::screen::length (),
1, 0xFFFF00);
}
--- 358,364 ----
if (gc.draw_grid)
{
! for (i = 0; i < gfx::screen::length (); i += lmap::square_size)
gfx::screen::display.fillrect (i, 0, 1, gfx::screen::height
(), 0xFFFF00);
! for (i = 0; i < gfx::screen::height (); i += lmap::square_size)
gfx::screen::display.fillrect (0, i, gfx::screen::length (),
1, 0xFFFF00);
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Makefile.am,v
retrieving revision 1.80.2.33
retrieving revision 1.80.2.34
diff -C2 -r1.80.2.33 -r1.80.2.34
*** Makefile.am 30 Jun 2002 19:01:01 -0000 1.80.2.33
--- Makefile.am 1 Jul 2002 19:46:49 -0000 1.80.2.34
***************
*** 1,5 ****
## Process this file with automake to produce Makefile.in
! MODULES_SUBDIRS = gfx input audio python map
if BUILD_TOOLS
--- 1,5 ----
## Process this file with automake to produce Makefile.in
! MODULES_SUBDIRS = gfx input audio python lmap
if BUILD_TOOLS
***************
*** 109,113 ****
joltest_LDADD = libgui.a gfx/libgfx.a input/libinput.a libbase.a
$(libbase_LDADD) $(libgui_LDADD)
! alextest_LDADD = map/libmap.a gfx/libgfx.a input/libinput.a libbase.a
$(libbase_LDADD)
#pytest_LDADD = libbase.a libpython.a gfx/libgfx.a input/libinput.a
$(libbase_LDADD) $(libpython_LDADD)
--- 109,113 ----
joltest_LDADD = libgui.a gfx/libgfx.a input/libinput.a libbase.a
$(libbase_LDADD) $(libgui_LDADD)
! alextest_LDADD = lmap/libmap.a gfx/libgfx.a input/libinput.a libbase.a
$(libbase_LDADD)
#pytest_LDADD = libbase.a libpython.a gfx/libgfx.a input/libinput.a
$(libbase_LDADD) $(libpython_LDADD)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: adonthell/src main.cc,1.39.2.25,1.39.2.26 Makefile.am,1.80.2.33,1.80.2.34,
Alexandre Courbot <address@hidden> <=
- Prev by Date:
[Adonthell-commits] CVS: adonthell/src/gfx surface.h,1.1.2.1,1.1.2.2 surface.cc,1.1.2.1,1.1.2.2 screen.h,1.1.2.1,1.1.2.2 screen.cc,1.1.2.1,1.1.2.2 pnm.cc,1.1.2.1,1.1.2.2 image.h,1.1.2.1,1.1.2.2 image.cc,1.1.2.1,1.1.2.2 drawable.h,1.1.2.1,1.1.2.2 animation.h,1.1.2.1,1.1.2.2
- Next by Date:
[Adonthell-commits] CVS: adonthell/src/gui - New directory
- Previous by thread:
[Adonthell-commits] CVS: adonthell/src/gfx surface.h,1.1.2.1,1.1.2.2 surface.cc,1.1.2.1,1.1.2.2 screen.h,1.1.2.1,1.1.2.2 screen.cc,1.1.2.1,1.1.2.2 pnm.cc,1.1.2.1,1.1.2.2 image.h,1.1.2.1,1.1.2.2 image.cc,1.1.2.1,1.1.2.2 drawable.h,1.1.2.1,1.1.2.2 animation.h,1.1.2.1,1.1.2.2
- Next by thread:
[Adonthell-commits] CVS: adonthell/src/gui - New directory
- Index(es):