diff -ur ballz-1.0/src/Makefile.am ballz-1.0.new/src/Makefile.am
--- ballz-1.0/src/Makefile.am 2007-04-05 22:21:32.000000000 +0200
+++ ballz-1.0.new/src/Makefile.am 2007-04-17 14:18:19.000000000 +0200
@@ -70,151 +70,6 @@
gui/ballzlistbox.cpp\
gui/ballzlistbox.hpp\
gui/ballzscrollarea.cpp\
-gui/ballzscrollarea.hpp\
-guichan/actionevent.cpp\
-guichan/actionevent.hpp\
-guichan/actionlistener.hpp\
-guichan/allegro.hpp\
-guichan/basiccontainer.cpp\
-guichan/basiccontainer.hpp\
-guichan/cliprectangle.cpp\
-guichan/cliprectangle.hpp\
-guichan/color.cpp\
-guichan/color.hpp\
-guichan/deathlistener.hpp\
-guichan/defaultfont.cpp\
-guichan/defaultfont.hpp\
-guichan/event.cpp\
-guichan/event.hpp\
-guichan/exception.cpp\
-guichan/exception.hpp\
-guichan/focushandler.cpp\
-guichan/focushandler.hpp\
-guichan/focuslistener.hpp\
-guichan/font.cpp\
-guichan/font.hpp\
-guichan/graphics.cpp\
-guichan/graphics.hpp\
-guichan/gui.cpp\
-guichan/gui.hpp\
-guichan/image.cpp\
-guichan/image.hpp\
-guichan/imagefont.cpp\
-guichan/imagefont.hpp\
-guichan/imageloader.hpp\
-guichan/input.hpp\
-guichan/inputevent.cpp\
-guichan/inputevent.hpp\
-guichan/key.cpp\
-guichan/key.hpp\
-guichan/keyevent.cpp\
-guichan/keyevent.hpp\
-guichan/keyinput.cpp\
-guichan/keyinput.hpp\
-guichan/keylistener.hpp\
-guichan/listmodel.hpp\
-guichan/mouseevent.cpp\
-guichan/mouseevent.hpp\
-guichan/mouseinput.cpp\
-guichan/mouseinput.hpp\
-guichan/mouselistener.hpp\
-guichan/platform.hpp\
-guichan/rectangle.cpp\
-guichan/rectangle.hpp\
-guichan/widget.cpp\
-guichan/widget.hpp\
-guichan/allegro/allegrofont.hpp\
-guichan/allegro/allegrographics.cpp\
-guichan/allegro/allegrographics.hpp\
-guichan/allegro/allegroimage.cpp\
-guichan/allegro/allegroimage.hpp\
-guichan/allegro/allegroimageloader.cpp\
-guichan/allegro/allegroimageloader.hpp\
-guichan/allegro/allegroinput.cpp\
-guichan/allegro/allegroinput.hpp\
-guichan/widgets/button.cpp\
-guichan/widgets/button.hpp\
-guichan/widgets/container.cpp\
-guichan/widgets/container.hpp\
-guichan/widgets/checkbox.cpp\
-guichan/widgets/checkbox.hpp\
-guichan/widgets/dropdown.hpp\
-guichan/widgets/dropdown.cpp\
-guichan/widgets/icon.cpp\
-guichan/widgets/icon.hpp\
-guichan/widgets/label.cpp\
-guichan/widgets/label.hpp\
-guichan/widgets/listbox.cpp\
-guichan/widgets/listbox.hpp\
-guichan/widgets/radiobutton.cpp\
-guichan/widgets/radiobutton.hpp\
-guichan/widgets/scrollarea.cpp\
-guichan/widgets/scrollarea.hpp\
-guichan/widgets/slider.cpp\
-guichan/widgets/slider.hpp\
-guichan/widgets/textbox.cpp\
-guichan/widgets/textbox.hpp\
-guichan/widgets/textfield.cpp\
-guichan/widgets/textfield.hpp\
-guichan/widgets/window.cpp\
-guichan/widgets/window.hpp\
-dumb/aldumb.h\
-dumb/dumb.h\
-dumb/allegro/alplay.c\
-dumb/allegro/datduh.c\
-dumb/allegro/datit.c\
-dumb/allegro/datitq.c\
-dumb/allegro/datmod.c\
-dumb/allegro/dats3m.c\
-dumb/allegro/dats3mq.c\
-dumb/allegro/datunld.c\
-dumb/allegro/datxm.c\
-dumb/allegro/datxmq.c\
-dumb/allegro/packfile.c\
-dumb/core/atexit.c\
-dumb/core/duhlen.c\
-dumb/core/duhtag.c\
-dumb/core/dumbfile.c\
-dumb/core/loadduh.c\
-dumb/core/makeduh.c\
-dumb/core/rawsig.c\
-dumb/core/readduh.c\
-dumb/core/register.c\
-dumb/core/rendduh.c\
-dumb/core/rendsig.c\
-dumb/core/unload.c\
-dumb/it/itload.c\
-dumb/it/itload2.c\
-dumb/it/itmisc.c\
-dumb/it/itorder.c\
-dumb/it/itread.c\
-dumb/it/itread2.c\
-dumb/it/itrender.c\
-dumb/it/itunload.c\
-dumb/it/loadmod.c\
-dumb/it/loadmod2.c\
-dumb/it/loads3m.c\
-dumb/it/loads3m2.c\
-dumb/it/loadxm.c\
-dumb/it/loadxm2.c\
-dumb/it/readmod.c\
-dumb/it/readmod2.c\
-dumb/it/reads3m.c\
-dumb/it/reads3m2.c\
-dumb/it/readxm.c\
-dumb/it/readxm2.c\
-dumb/it/xmeffect.c\
-dumb/helpers/clickrem.c\
-dumb/helpers/memfile.c\
-dumb/helpers/resamp2.inc\
-dumb/helpers/resamp3.inc\
-dumb/helpers/resample.inc\
-dumb/helpers/resample.c\
-dumb/helpers/sampbuf.c\
-dumb/helpers/silence.c\
-dumb/helpers/stdfile.c\
-dumb/internal/aldumb.h\
-dumb/internal/dumb.h\
-dumb/internal/it.h
-
+gui/ballzscrollarea.hpp
+ballz_LDFLAGS = -ldumb -laldmb -lguichan -lguichan_allegro
diff -ur ballz-1.0/src/gui/ballzlistbox.cpp ballz-1.0.new/src/gui/ballzlistbox.cpp
--- ballz-1.0/src/gui/ballzlistbox.cpp 2007-04-04 20:00:50.000000000 +0200
+++ ballz-1.0.new/src/gui/ballzlistbox.cpp 2007-04-17 14:53:12.000000000 +0200
@@ -70,7 +70,9 @@
{
if (isFocused())
{
- allegroGraphics->drawBitmap(mSelectedImage, 0, y + 1);
+ gcn::AllegroImage image(mSelectedImage, 0);
+ allegroGraphics->drawImage(&image, 0, 0, 0,
+ y + 1, image.getWidth(), image.getHeight());
}
}
diff -ur ballz-1.0/src/gui/datawriter.cpp ballz-1.0.new/src/gui/datawriter.cpp
--- ballz-1.0/src/gui/datawriter.cpp 2007-04-04 20:01:03.000000000 +0200
+++ ballz-1.0.new/src/gui/datawriter.cpp 2007-04-17 14:48:01.000000000 +0200
@@ -105,15 +105,21 @@
if (mImage == BALLZ)
{
- allegroGraphics->drawBitmap(mBallzImage, 8, 8);
+ gcn::AllegroImage image(mBallzImage, 0);
+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(),
+ image.getHeight());
}
else if (mImage == THEPROFESSOR)
{
- allegroGraphics->drawBitmap(mTheProfessorImage, 8, 8);
- }
- else if (mImage == THECOLONEL)
- {
- allegroGraphics->drawBitmap(mTheColonelImage, 8, 8);
+ gcn::AllegroImage image(mTheProfessorImage, 0);
+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(),
+ image.getHeight());
+ }
+ else if (mImage == THECOLONEL)
+ {
+ gcn::AllegroImage image(mTheColonelImage, 0);
+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(),
+ image.getHeight());
}
unsigned int i;
diff -ur ballz-1.0/src/gui/levelselector.cpp ballz-1.0.new/src/gui/levelselector.cpp
--- ballz-1.0/src/gui/levelselector.cpp 2007-04-04 20:01:09.000000000 +0200
+++ ballz-1.0.new/src/gui/levelselector.cpp 2007-04-17 14:50:38.000000000 +0200
@@ -148,7 +148,9 @@
{
if (isFocused())
{
- allegroGraphics->drawBitmap(mSelectedImage, 0, y);
+ gcn::AllegroImage image(mSelectedImage, 0);
+ allegroGraphics->drawImage(&image, 0, 0, 0, y,
+ image.getWidth(), image.getHeight());
}
}