[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] [pingus.pingus-allegro] 8 new revisions pushed by address@h
|
From: |
pingus |
|
Subject: |
[Pingus-CVS] [pingus.pingus-allegro] 8 new revisions pushed by address@hidden on 2013-12-01 19:02 GMT |
|
Date: |
Sun, 01 Dec 2013 19:15:34 +0000 |
master moved from d3c761a495ba to 229e3aea8430
8 new revisions:
Revision: dc9eb0ef188a
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 18:31:53 2013 UTC
Log: Switched to 32bit and fixed palette issues
http://code.google.com/p/pingus/source/detail?r=dc9eb0ef188a&repo=pingus-allegro
Revision: 56d5148bad4f
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 18:36:18 2013 UTC
Log: Fixed transparency issues with sprites
http://code.google.com/p/pingus/source/detail?r=56d5148bad4f&repo=pingus-allegro
Revision: ab0edafc235f
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 18:46:20 2013 UTC
Log: Slowed the game down and fixed mouse pointer not properly showing
http://code.google.com/p/pingus/source/detail?r=ab0edafc235f&repo=pingus-allegro
Revision: e37864f63acb
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 18:46:33 2013 UTC
Log: Reduced pingus count and spaced them further appart
http://code.google.com/p/pingus/source/detail?r=e37864f63acb&repo=pingus-allegro
Revision: 3759412765e8
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 19:00:52 2013 UTC
Log: Use hardware cursor instead of software cursor
http://code.google.com/p/pingus/source/detail?r=3759412765e8&repo=pingus-allegro
Revision: 0c85ccc66f61
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 19:01:09 2013 UTC
Log: Removed unused palette handling
http://code.google.com/p/pingus/source/detail?r=0c85ccc66f61&repo=pingus-allegro
Revision: f49aef19bf89
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 19:01:20 2013 UTC
Log: Added paint ability
http://code.google.com/p/pingus/source/detail?r=f49aef19bf89&repo=pingus-allegro
Revision: 229e3aea8430
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 19:02:38 2013 UTC
Log: Removed some stdout verbosity
http://code.google.com/p/pingus/source/detail?r=229e3aea8430&repo=pingus-allegro
==============================================================================
Revision: dc9eb0ef188a
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 18:31:53 2013 UTC
Log: Switched to 32bit and fixed palette issues
http://code.google.com/p/pingus/source/detail?r=dc9eb0ef188a&repo=pingus-allegro
Modified:
/init.cc
/world.cc
=======================================
--- /init.cc Sun Dec 1 16:05:26 2013 UTC
+++ /init.cc Sun Dec 1 18:31:53 2013 UTC
@@ -18,7 +18,7 @@
install_timer();
install_mouse();
- //set_color_depth(16);
+ set_color_depth(32);
set_gfx_mode(GFX_AUTODETECT_WINDOWED, 640, 480, 0, 0);
show_mouse(screen);
=======================================
--- /world.cc Sun Dec 1 16:05:26 2013 UTC
+++ /world.cc Sun Dec 1 18:31:53 2013 UTC
@@ -66,7 +66,10 @@
assert(gfx_map);
set_palette(pal);
+ int conversion_mode = get_color_conversion();
+ set_color_conversion(COLORCONV_NONE);
col_map = load_pcx("levels/1.pcx", pal);
+ set_color_conversion(conversion_mode);
assert(col_map);
puts("World init : finished");
}
==============================================================================
Revision: 56d5148bad4f
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 18:36:18 2013 UTC
Log: Fixed transparency issues with sprites
http://code.google.com/p/pingus/source/detail?r=56d5148bad4f&repo=pingus-allegro
Modified:
/images/PINGU_FALLing.PCX
/images/pingu.pcx
=======================================
--- /images/PINGU_FALLing.PCX Sun Dec 1 16:05:26 2013 UTC
+++ /images/PINGU_FALLing.PCX Sun Dec 1 18:36:18 2013 UTC
Binary file, no diff available.
=======================================
--- /images/pingu.pcx Sun Dec 1 16:05:26 2013 UTC
+++ /images/pingu.pcx Sun Dec 1 18:36:18 2013 UTC
Binary file, no diff available.
==============================================================================
Revision: ab0edafc235f
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 18:46:20 2013 UTC
Log: Slowed the game down and fixed mouse pointer not properly showing
http://code.google.com/p/pingus/source/detail?r=ab0edafc235f&repo=pingus-allegro
Modified:
/init.cc
/level.cc
/playfield.cc
=======================================
--- /init.cc Sun Dec 1 18:31:53 2013 UTC
+++ /init.cc Sun Dec 1 18:46:20 2013 UTC
@@ -21,7 +21,7 @@
set_color_depth(32);
set_gfx_mode(GFX_AUTODETECT_WINDOWED, 640, 480, 0, 0);
- show_mouse(screen);
+ //show_mouse(screen);
puts("Finished Initialisation");
}
=======================================
--- /level.cc Sun Dec 1 16:05:26 2013 UTC
+++ /level.cc Sun Dec 1 18:46:20 2013 UTC
@@ -20,6 +20,7 @@
readkey();
quit = true;
}
+
if (mouse_b & 1) {
//show_mouse(NULL);
circlefill(playfield.world.gfx_map, mouse_x, mouse_y, 10, 0);
@@ -34,7 +35,10 @@
}
playfield.draw();
+ show_mouse(screen);
+ rest(10);
}
+ show_mouse(NULL);
return 0;
}
=======================================
--- /playfield.cc Sun Dec 1 16:05:26 2013 UTC
+++ /playfield.cc Sun Dec 1 18:46:20 2013 UTC
@@ -23,7 +23,7 @@
//show_mouse(NULL);
blit(buffer, screen, 0,0,0,0, 640, 480);
- show_mouse(screen);
+ //show_mouse(screen);
// GuiObj::draw();
}
==============================================================================
Revision: e37864f63acb
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 18:46:33 2013 UTC
Log: Reduced pingus count and spaced them further appart
http://code.google.com/p/pingus/source/detail?r=e37864f63acb&repo=pingus-allegro
Modified:
/world.cc
=======================================
--- /world.cc Sun Dec 1 18:31:53 2013 UTC
+++ /world.cc Sun Dec 1 18:46:33 2013 UTC
@@ -10,7 +10,7 @@
{
puts("World init");
gfx_map = col_map = 0;
- pingu.resize(100);
+ pingu.resize(50);
puts("World init ende");
}
@@ -59,7 +59,7 @@
PALETTE pal;
for(int i=0; i < pingu.size(); ++i) {
- pingu[i].set_pos(i*6 + 10, 175);
+ pingu[i].set_pos(i*12 + 10, 175);
}
puts("World init : loading gfx");
gfx_map = load_pcx("levels/1_gfx.pcx", pal);
==============================================================================
Revision: 3759412765e8
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 19:00:52 2013 UTC
Log: Use hardware cursor instead of software cursor
http://code.google.com/p/pingus/source/detail?r=3759412765e8&repo=pingus-allegro
Modified:
/init.cc
/playfield.cc
=======================================
--- /init.cc Sun Dec 1 18:46:20 2013 UTC
+++ /init.cc Sun Dec 1 19:00:52 2013 UTC
@@ -21,7 +21,8 @@
set_color_depth(32);
set_gfx_mode(GFX_AUTODETECT_WINDOWED, 640, 480, 0, 0);
- //show_mouse(screen);
+ show_os_cursor(MOUSE_CURSOR_ARROW);
+
puts("Finished Initialisation");
}
=======================================
--- /playfield.cc Sun Dec 1 18:46:20 2013 UTC
+++ /playfield.cc Sun Dec 1 19:00:52 2013 UTC
@@ -21,9 +21,7 @@
world.let_move();
world.draw(buffer);
- //show_mouse(NULL);
blit(buffer, screen, 0,0,0,0, 640, 480);
- //show_mouse(screen);
// GuiObj::draw();
}
==============================================================================
Revision: 0c85ccc66f61
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 19:01:09 2013 UTC
Log: Removed unused palette handling
http://code.google.com/p/pingus/source/detail?r=0c85ccc66f61&repo=pingus-allegro
Modified:
/pingu.cc
/world.cc
=======================================
--- /pingu.cc Sun Dec 1 16:05:26 2013 UTC
+++ /pingu.cc Sun Dec 1 19:01:09 2013 UTC
@@ -12,16 +12,15 @@
alive = true;
falling = 0;
direction = left;
- PALETTE pal;
- sprite = load_pcx("images/pingu.pcx", pal);
- fall_sprite = load_pcx("images/PINGU_FALLing.PCX", pal);
+ sprite = load_pcx("images/pingu.pcx", NULL);
+ fall_sprite = load_pcx("images/PINGU_FALLing.PCX", NULL);
if (sprite == 0 || fall_sprite == 0) {
std::cerr << "Sceo" << std::endl;
exit(1);
}
- set_palette(pal);
+
std::cout << "Pingu.set_pos init ende" << std::endl;
set_pos(x, y);
@@ -36,10 +35,9 @@
alive = true;
falling = 0;
direction = left;
- PALETTE pal;
- sprite = load_pcx("images/pingu.pcx", pal);
- fall_sprite = load_pcx("images/PINGU_FALLing.PCX", pal);
+ sprite = load_pcx("images/pingu.pcx", NULL);
+ fall_sprite = load_pcx("images/PINGU_FALLing.PCX", NULL);
if (sprite == 0 || fall_sprite == 0) {
fprintf(stderr, "Sceo\n");
@@ -58,7 +56,11 @@
void
Pingu::draw(BITMAP* scr)
{
- putpixel(scr, x_pos, y_pos, rand()%255);
+ if (!alive)
+ return;
+
+ //putpixel(scr, x_pos, y_pos, rand()%255);
+
if (falling > 2) {
draw_sprite(scr, fall_sprite, x_pos - sprite->w/2, y_pos-sprite->h);
} else {
=======================================
--- /world.cc Sun Dec 1 18:46:33 2013 UTC
+++ /world.cc Sun Dec 1 19:01:09 2013 UTC
@@ -56,19 +56,16 @@
void
World::init()
{
- PALETTE pal;
-
for(int i=0; i < pingu.size(); ++i) {
pingu[i].set_pos(i*12 + 10, 175);
}
puts("World init : loading gfx");
- gfx_map = load_pcx("levels/1_gfx.pcx", pal);
+ gfx_map = load_pcx("levels/1_gfx.pcx", NULL);
assert(gfx_map);
- set_palette(pal);
-
+
int conversion_mode = get_color_conversion();
set_color_conversion(COLORCONV_NONE);
- col_map = load_pcx("levels/1.pcx", pal);
+ col_map = load_pcx("levels/1.pcx", NULL);
set_color_conversion(conversion_mode);
assert(col_map);
puts("World init : finished");
==============================================================================
Revision: f49aef19bf89
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 19:01:20 2013 UTC
Log: Added paint ability
http://code.google.com/p/pingus/source/detail?r=f49aef19bf89&repo=pingus-allegro
Modified:
/level.cc
=======================================
--- /level.cc Sun Dec 1 18:46:20 2013 UTC
+++ /level.cc Sun Dec 1 19:01:20 2013 UTC
@@ -22,23 +22,21 @@
}
if (mouse_b & 1) {
- //show_mouse(NULL);
circlefill(playfield.world.gfx_map, mouse_x, mouse_y, 10, 0);
circlefill(playfield.world.col_map, mouse_x, mouse_y, 10, 0);
- //show_mouse(screen);
} else if (mouse_b & 2) {
puts("New Pingu");
playfield.world.pingu.push_back(*(new Pingu(mouse_x, mouse_y)));
puts("Happy Pinguing");
- } else if (mouse_b & 3) {
- puts("Wrong Button");
+ } else if (mouse_b & 4) {
+ circlefill(playfield.world.gfx_map, mouse_x, mouse_y, 10, 0xffffff);
+ circlefill(playfield.world.col_map, mouse_x, mouse_y, 10, 255);
}
playfield.draw();
- show_mouse(screen);
+
rest(10);
}
- show_mouse(NULL);
return 0;
}
==============================================================================
Revision: 229e3aea8430
Author: Ingo Ruhnke <address@hidden>
Date: Sun Dec 1 19:02:38 2013 UTC
Log: Removed some stdout verbosity
http://code.google.com/p/pingus/source/detail?r=229e3aea8430&repo=pingus-allegro
Modified:
/level.cc
/pingu.cc
=======================================
--- /level.cc Sun Dec 1 19:01:20 2013 UTC
+++ /level.cc Sun Dec 1 19:02:38 2013 UTC
@@ -25,9 +25,9 @@
circlefill(playfield.world.gfx_map, mouse_x, mouse_y, 10, 0);
circlefill(playfield.world.col_map, mouse_x, mouse_y, 10, 0);
} else if (mouse_b & 2) {
- puts("New Pingu");
+ //puts("New Pingu");
playfield.world.pingu.push_back(*(new Pingu(mouse_x, mouse_y)));
- puts("Happy Pinguing");
+ //puts("Happy Pinguing");
} else if (mouse_b & 4) {
circlefill(playfield.world.gfx_map, mouse_x, mouse_y, 10, 0xffffff);
circlefill(playfield.world.col_map, mouse_x, mouse_y, 10, 255);
=======================================
--- /pingu.cc Sun Dec 1 19:01:09 2013 UTC
+++ /pingu.cc Sun Dec 1 19:02:38 2013 UTC
@@ -7,7 +7,7 @@
Pingu::Pingu(int x, int y)
{
- std::cout << "Pingu.set_pos init" << std::endl;
+ //std::cout << "Pingu.set_pos init" << std::endl;
sprite = 0;
alive = true;
falling = 0;
@@ -21,7 +21,7 @@
exit(1);
}
- std::cout << "Pingu.set_pos init ende" << std::endl;
+ //std::cout << "Pingu.set_pos init ende" << std::endl;
set_pos(x, y);
falling = 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] [pingus.pingus-allegro] 8 new revisions pushed by address@hidden on 2013-12-01 19:02 GMT,
pingus <=