#define MOUSE_LEFT_MARGIN 80
#define MOUSE_RIGHT_MARGIN (560-32)
-/* right_margin should noticed that the cursor is 32 pixels,
- so it should subtract that value */
-#define MOUSE_POS_SPEED 20
+
+/* scolling speed */
+#define KEYBOARD_SPEED 140
+#define MOUSE_SPEED 40
/* look */
#define SELECT_W 2 // size of the selections lines
static bool show_minimap;
static bool show_selections;
static bool le_help_shown;
-static int pos_x, cursor_x, cursor_y, fire;
+static int pos_x, pos_y, cursor_x, cursor_y;
static int le_level;
static World* le_world;
static LevelSubset* le_level_subset;
static Button* le_previous_level_bt;
static Button* le_move_right_bt;
static Button* le_move_left_bt;
+static Button* le_move_up_bt;
+static Button* le_move_down_bt;
static Button* le_rubber_bt;
static Button* le_select_mode_one_bt;
static Button* le_select_mode_two_bt;
static GameObject* selected_game_object;
static square selection;
-static int le_selection_mode;
+static SelectionMode le_selection_mode;
static SDL_Event event;
TileMapType active_tm;
if(le_world != NULL)
{
/* making events results to be in order */
- if(pos_x < 0)
- pos_x = 0;
- if(pos_x > (le_world->get_level()->width * 32) - screen->w)
- pos_x = (le_world->get_level()->width * 32) - screen->w;
/* draw the level */
le_drawlevel();
level_settings_menu->additem(MN_STRINGSELECT,"Bg-Image",0,0,MNID_BGIMG);
level_settings_menu->additem(MN_STRINGSELECT,"Particle",0,0,MNID_PARTICLE);
level_settings_menu->additem(MN_NUMFIELD, "Length ",0,0,MNID_LENGTH);
+ level_settings_menu->additem(MN_NUMFIELD, "Height ",0,0,MNID_HEIGHT);
level_settings_menu->additem(MN_NUMFIELD, "Time ",0,0,MNID_TIME);
level_settings_menu->additem(MN_NUMFIELD, "Gravity ",0,0,MNID_GRAVITY);
level_settings_menu->additem(MN_NUMFIELD, "Bg-Img-Speed",0,0,MNID_BGSPEED);
show_selections = true;
scroll_x = 0;
- fire = DOWN;
done = 0;
le_frame = 0; /* support for frames in some tiles, like waves and bad guys */
le_level_changed = false;
/* Load buttons */
le_save_level_bt = new Button("/images/icons/save.png","Save level", SDLK_F6,screen->w-64,32);
le_exit_bt = new Button("/images/icons/exit.png","Exit", SDLK_F10,screen->w-32,32);
- le_next_level_bt = new Button("/images/icons/up.png","Next level", SDLK_PAGEUP,screen->w-64,0);
- le_previous_level_bt = new Button("/images/icons/down.png","Previous level",SDLK_PAGEDOWN,screen->w-32,0);
+ le_next_level_bt = new Button("/images/icons/next.png","Next level", SDLK_PAGEUP,screen->w-64,0);
+ le_previous_level_bt = new Button("/images/icons/previous.png","Previous level",SDLK_PAGEDOWN,screen->w-32,0);
le_rubber_bt = new Button("/images/icons/rubber.png","Rubber",SDLK_DELETE,screen->w-32,48);
le_select_mode_one_bt = new Button ("/images/icons/select-mode1.png","Select single tile",SDLK_F3,screen->w-64,48);
le_select_mode_two_bt = new Button("/images/icons/select-mode2.png","Select multiple tiles",SDLK_F3,screen->w-64,48);
le_test_level_bt = new Button("/images/icons/test-level.png","Test level",SDLK_F4,screen->w-64,screen->h - 64);
le_settings_bt = new Button("/images/icons/settings.png","Level settings",SDLK_F5,screen->w-32,screen->h - 64);
- le_move_left_bt = new Button("/images/icons/left.png","Move left",SDLK_LEFT,0,0);
+ le_move_left_bt = new Button("/images/icons/left.png","Move left",SDLK_LEFT,screen->w-80-16,0);
le_move_right_bt = new Button("/images/icons/right.png","Move right",SDLK_RIGHT,screen->w-80,0);
+ le_move_up_bt = new Button("/images/icons/up.png","Move up",SDLK_UP,screen->w-80,16);
+ le_move_down_bt = new Button("/images/icons/down.png","Move down",SDLK_DOWN,screen->w-80,32);
le_tilegroup_bt = new Button("/images/icons/tilegroup.png","Select Tilegroup", SDLK_F7,screen->w-64,64);
le_objects_bt = new Button("/images/icons/objects.png","Select Objects", SDLK_F8,screen->w-64,80);
le_object_select_bt = new Button("/images/icons/select-one.png","Select an Object", SDLK_s, screen->w - 64, screen->h-98);
sprintf(str,"%d",le_world->get_level()->width);
level_settings_menu->get_item_by_id(MNID_LENGTH).change_input(str);
+ sprintf(str,"%d",le_world->get_level()->height);
+ level_settings_menu->get_item_by_id(MNID_HEIGHT).change_input(str);
sprintf(str,"%d",le_world->get_level()->time_left);
level_settings_menu->get_item_by_id(MNID_TIME).change_input(str);
sprintf(str,"%2.0f",le_world->get_level()->gravity);
{
int i;
i = false;
+ le_level_changed = true;
le_world->get_level()->name = level_settings_menu->get_item_by_id(MNID_NAME).input;
le_world->get_level()->author = level_settings_menu->get_item_by_id(MNID_AUTHOR).input;
le_world->get_level()->song_title = string_list_active(level_settings_menu->get_item_by_id(MNID_SONG).list);
- le_world->get_level()->change_size(atoi(level_settings_menu->get_item_by_id(MNID_LENGTH).input));
+ le_world->get_level()->change_width(atoi(level_settings_menu->get_item_by_id(MNID_LENGTH).input));
+ le_world->get_level()->change_height(atoi(level_settings_menu->get_item_by_id(MNID_HEIGHT).input));
le_world->get_level()->time_left = atoi(level_settings_menu->get_item_by_id(MNID_TIME).input);
le_world->get_level()->gravity = atof(level_settings_menu->get_item_by_id(MNID_GRAVITY).input);
le_world->get_level()->bkgd_speed = atoi(level_settings_menu->get_item_by_id(MNID_BGSPEED).input);
le_level_subset->title = subset_settings_menu->item[2].input;
le_level_subset->description = subset_settings_menu->item[3].input;
le_level_subset->save();
+ le_level_changed = false;
}
void le_unload_level()
delete le_previous_level_bt;
delete le_move_right_bt;
delete le_move_left_bt;
+ delete le_move_up_bt;
+ delete le_move_down_bt;
delete le_rubber_bt;
delete le_select_mode_one_bt;
delete le_select_mode_two_bt;
mini_tile_width = 1;
int left_offset = (screen->w - 64 - le_world->get_level()->width*mini_tile_width) / 2;
- for (int y = 0; y < 15; ++y)
+ int mini_tile_height;
+ if(screen->h - 64 > le_world->get_level()->height * 4)
+ mini_tile_height = 4;
+ else if(screen->h - 64 > le_world->get_level()->height * 2)
+ mini_tile_height = 2;
+ else
+ mini_tile_height = 1;
+
+ for (int y = 0; y < le_world->get_level()->height; ++y)
for (int x = 0; x < le_world->get_level()->width; ++x)
{
}
- fillrect(left_offset, 0, le_world->get_level()->width*mini_tile_width, 15*4, 200, 200, 200, 128);
+ fillrect(left_offset, 0, le_world->get_level()->width*mini_tile_width, le_world->get_level()->height*mini_tile_height, 200, 200, 200, 128);
fillrect(left_offset + (pos_x/32)*mini_tile_width, 0, 19*mini_tile_width, 2, 200, 200, 200, 200);
- fillrect(left_offset + (pos_x/32)*mini_tile_width, 0, 2, 15*4, 200, 200, 200, 200);
- fillrect(left_offset + (pos_x/32)*mini_tile_width + 19*mini_tile_width - 2, 0, 2, 15*4, 200, 200, 200, 200);
- fillrect(left_offset + (pos_x/32)*mini_tile_width, 15*4-2, 19*mini_tile_width, 2, 200, 200, 200, 200);
+ fillrect(left_offset + (pos_x/32)*mini_tile_width, 0, 2, le_world->get_level()->height*mini_tile_height, 200, 200, 200, 200);
+ fillrect(left_offset + (pos_x/32)*mini_tile_width + 19*mini_tile_width - 2, 0, 2, le_world->get_level()->height*mini_tile_height, 200, 200, 200, 200);
+ fillrect(left_offset + (pos_x/32)*mini_tile_width, le_world->get_level()->height*mini_tile_height-2, 19*mini_tile_width, 2, 200, 200, 200, 200);
}
/* draw a grid (if selected) */
if(le_show_grid)
{
- for(x = 0; x < 19; x++)
+ for(x = 0; x < VISIBLE_TILES_X; x++)
fillrect(x*32 - ((int)pos_x % 32), 0, 1, screen->h, 225, 225, 225,255);
- for(y = 0; y < 15; y++)
- fillrect(0, y*32, screen->w - 32, 1, 225, 225, 225,255);
+ for(y = 0; y < VISIBLE_TILES_Y; y++)
+ fillrect(0, y*32 - ((int)pos_y % 32), screen->w, 1, 225, 225, 225,255);
}
}
if(le_selection_mode == CURSOR)
{
if(le_current.IsTile())
- le_selection->draw( cursor_x - pos_x, cursor_y);
+ le_selection->draw(cursor_x - pos_x, cursor_y - pos_y);
}
else if(le_selection_mode == SQUARE)
{
/* draw current selection */
w = selection.x2 - selection.x1;
h = selection.y2 - selection.y1;
- fillrect(selection.x1 - pos_x, selection.y1, w, SELECT_W, SELECT_CLR);
- fillrect(selection.x1 - pos_x + w, selection.y1, SELECT_W, h, SELECT_CLR);
- fillrect(selection.x1 - pos_x, selection.y1 + h, w, SELECT_W, SELECT_CLR);
- fillrect(selection.x1 - pos_x, selection.y1, SELECT_W, h, SELECT_CLR);
+ fillrect(selection.x1 - pos_x, selection.y1 - pos_y, w, SELECT_W, SELECT_CLR);
+ fillrect(selection.x1 - pos_x + w, selection.y1 - pos_y, SELECT_W, h, SELECT_CLR);
+ fillrect(selection.x1 - pos_x, selection.y1 - pos_y + h, w, SELECT_W, SELECT_CLR);
+ fillrect(selection.x1 - pos_x, selection.y1 - pos_y, SELECT_W, h, SELECT_CLR);
}
}
if(le_current.IsTile())
{
- Tile::draw(19 * 32, 14 * 32, le_current.tile);
+ Tile::draw(screen->w - 32, screen->h - 32, le_current.tile);
if(TileManager::instance()->get(le_current.tile)->editor_images.size() > 0)
- TileManager::instance()->get(le_current.tile)->editor_images[0]->draw( 19 * 32, 14 * 32);
+ TileManager::instance()->get(le_current.tile)->editor_images[0]->draw( screen->w - 32, screen->h - 32);
}
if(le_current.IsObject() && MouseCursor::current() != mouse_select_object)
{
- le_current.obj->draw_on_screen(19 * 32, 14 * 32);
+ le_current.obj->draw_on_screen(screen->w - 32, screen->h - 32);
le_current.obj->draw_on_screen(cursor_x,cursor_y);
}
if(mouse_select_object && selected_game_object != NULL)
{
- fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y,selected_game_object->base.width,3,255,0,0,255);
- fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y,3,selected_game_object->base.height,255,0,0,255);
- fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y+selected_game_object->base.height,selected_game_object->base.width,3,255,0,0,255);
- fillrect(selected_game_object->base.x-pos_x+selected_game_object->base.width,selected_game_object->base.y,3,selected_game_object->base.height,255,0,0,255);
+ fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y-pos_y,selected_game_object->base.width,3,255,0,0,255);
+ fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y-pos_y,3,selected_game_object->base.height,255,0,0,255);
+ fillrect(selected_game_object->base.x-pos_x,selected_game_object->base.y-pos_y+selected_game_object->base.height,selected_game_object->base.width,3,255,0,0,255);
+ fillrect(selected_game_object->base.x-pos_x+selected_game_object->base.width,selected_game_object->base.y-pos_y,3,selected_game_object->base.height,255,0,0,255);
}
if(le_world != NULL)
le_settings_bt->draw();
le_move_right_bt->draw();
le_move_left_bt->draw();
+ le_move_up_bt->draw();
+ le_move_down_bt->draw();
le_tilegroup_bt->draw();
le_objects_bt->draw();
if(!cur_tilegroup.empty())
void le_drawlevel()
{
- unsigned int y,x,s;
+ unsigned int y,x;
Uint8 a;
/* Draw the real background */
- if(le_world->get_level()->bkgd_image[0] != '\0')
- {
- s = (int)((float)pos_x * ((float)le_world->get_level()->bkgd_speed/100.0f)) % screen->w;
- le_world->get_level()->img_bkgd->draw_part(s,0,0,0,
- le_world->get_level()->img_bkgd->w - s - 32, le_world->get_level()->img_bkgd->h);
- le_world->get_level()->img_bkgd->draw_part(0,0,screen->w - s - 32 ,0,s,
- le_world->get_level()->img_bkgd->h);
- }
+ if (le_world->get_level()->img_bkgd)
+ le_world->get_level()->draw_bg();
else
- {
drawgradient(le_world->get_level()->bkgd_top, le_world->get_level()->bkgd_bottom);
- }
if(le_current.IsTile())
{
- Tile::draw(cursor_x-pos_x, cursor_y,le_current.tile,128);
+ Tile::draw(cursor_x-pos_x, cursor_y-pos_y,le_current.tile,128);
if(!TileManager::instance()->get(le_current.tile)->images.empty())
- fillrect(cursor_x-pos_x,cursor_y,TileManager::instance()->get(le_current.tile)->images[0]->w,TileManager::instance()->get(le_current.tile)->images[0]->h,50,50,50,50);
+ fillrect(cursor_x-pos_x,cursor_y-pos_y,TileManager::instance()->get(le_current.tile)->images[0]->w,TileManager::instance()->get(le_current.tile)->images[0]->h,50,50,50,50);
}
if(le_current.IsObject())
{
/* clearscreen(current_level.bkgd_red, current_level.bkgd_green, current_level.bkgd_blue); */
- for (y = 0; y < 15; ++y)
- for (x = 0; x < 20; ++x)
+ for (y = 0; y < VISIBLE_TILES_Y && y < (unsigned)le_world->get_level()->height; ++y)
+ for (x = 0; x < (unsigned)VISIBLE_TILES_X - 2; ++x)
{
if(active_tm == TM_BG)
else
a = 128;
- Tile::draw(32*x - fmodf(pos_x, 32), y * 32, le_world->get_level()->bg_tiles[y][x + (int)(pos_x / 32)],a);
+ Tile::draw(32*x - fmodf(pos_x, 32), y*32 - fmodf(pos_y, 32), le_world->get_level()->bg_tiles[y + (int)(pos_y / 32)][x + (int)(pos_x / 32)],a);
if(active_tm == TM_IA)
a = 255;
else
a = 128;
- Tile::draw(32*x - fmodf(pos_x, 32), y * 32, le_world->get_level()->ia_tiles[y][x + (int)(pos_x / 32)],a);
+ Tile::draw(32*x - fmodf(pos_x, 32), y*32 - fmodf(pos_y, 32), le_world->get_level()->ia_tiles[y + (int)(pos_y / 32)][x + (int)(pos_x / 32)],a);
if(active_tm == TM_FG)
a = 255;
else
a = 128;
- Tile::draw(32*x - fmodf(pos_x, 32), y * 32, le_world->get_level()->fg_tiles[y][x + (int)(pos_x / 32)],a);
+ Tile::draw(32*x - fmodf(pos_x, 32), y*32 - fmodf(pos_y, 32), le_world->get_level()->fg_tiles[y + (int)(pos_y / 32)][x + (int)(pos_x / 32)],a);
/* draw whats inside stuff when cursor is selecting those */
/* (draw them all the time - is this the right behaviour?) */
- Tile* edit_image = TileManager::instance()->get(le_world->get_level()->ia_tiles[y][x + (int)(pos_x / 32)]);
+ Tile* edit_image = TileManager::instance()->get(le_world->get_level()->ia_tiles[y + (int)(pos_y / 32)][x + (int)(pos_x / 32)]);
if(edit_image && !edit_image->editor_images.empty())
- edit_image->editor_images[0]->draw( x * 32 - ((int)pos_x % 32), y*32);
+ edit_image->editor_images[0]->draw( x * 32 - ((int)pos_x % 32), y*32 - ((int)pos_y % 32));
}
/* to support frames: img_bsod_left[(frame / 5) % 4] */
scroll_x = pos_x;
+ scroll_y = pos_y;
(*it)->draw();
}
/* Draw the player: */
/* for now, the position is fixed at (100, 240) */
- largetux.walk_right->draw( 100 - pos_x, 240);
+ largetux.walk_right->draw( 100 - pos_x, 240 - pos_y);
}
void le_change_object_properties(GameObject *pobj)
case SDLK_ESCAPE:
Menu::set_current(leveleditor_menu);
break;
- case SDLK_LEFT:
- if(fire == DOWN)
- cursor_x -= KEY_CURSOR_SPEED;
- else
- cursor_x -= KEY_CURSOR_FASTSPEED;
-
- if(cursor_x < pos_x + MOUSE_LEFT_MARGIN)
- pos_x = cursor_x - MOUSE_LEFT_MARGIN;
-
- break;
- case SDLK_RIGHT:
- if(fire == DOWN)
- cursor_x += KEY_CURSOR_SPEED;
- else
- cursor_x += KEY_CURSOR_FASTSPEED;
-
- if(cursor_x > pos_x + MOUSE_RIGHT_MARGIN-32)
- pos_x = cursor_x - MOUSE_RIGHT_MARGIN+32;
-
- break;
- case SDLK_UP:
- if(fire == DOWN)
- cursor_y -= KEY_CURSOR_SPEED;
- else
- cursor_y -= KEY_CURSOR_FASTSPEED;
-
- if(cursor_y < 0)
- cursor_y = 0;
- break;
- case SDLK_DOWN:
- if(fire == DOWN)
- cursor_y += KEY_CURSOR_SPEED;
- else
- cursor_y += KEY_CURSOR_FASTSPEED;
-
- if(cursor_y > screen->h-32)
- cursor_y = screen->h-32;
- break;
- case SDLK_LCTRL:
- fire =UP;
- break;
case SDLK_F1:
if(le_world != NULL)
le_showhelp();
break;
}
break;
- case SDL_KEYUP: /* key released */
- switch(event.key.keysym.sym)
- {
- case SDLK_LCTRL:
- fire = DOWN;
- break;
- default:
- break;
- }
- break;
case SDL_MOUSEBUTTONDOWN:
if(event.button.button == SDL_BUTTON_LEFT)
{
le_mouse_pressed[LEFT] = true;
selection.x1 = event.motion.x + pos_x;
- selection.y1 = event.motion.y;
+ selection.y1 = event.motion.y + pos_y;
selection.x2 = event.motion.x + pos_x;
- selection.y2 = event.motion.y;
+ selection.y2 = event.motion.y + pos_y;
}
else if(event.button.button == SDL_BUTTON_RIGHT)
{
if(le_current.IsTile())
{
cursor_x = ((int)(pos_x + x) / 32) * 32;
- cursor_y = ((int) y / 32) * 32;
+ cursor_y = ((int)(pos_y + y) / 32) * 32;
}
else
{
if(le_mouse_pressed[LEFT])
{
selection.x2 = x + pos_x;
- selection.y2 = y;
+ selection.y2 = y + pos_y;
}
if(le_mouse_pressed[RIGHT])
{
pos_x += -1 * event.motion.xrel;
+ pos_y += -1 * event.motion.yrel;
}
}
break;
- case SDL_QUIT: // window closed
- done = 1;
- break;
default:
break;
}
}
+ else if(event.type == SDL_QUIT) /* window closing */
+ {
+ done = 1;
+ }
}
if(le_world != NULL)
else if(le_current.IsObject())
{
cursor_base.x = cursor_x + pos_x;
- cursor_base.y = cursor_y + pos_x;
+ cursor_base.y = cursor_y + pos_y;
}
cursor_base.width = 32;
cursor_base.height = 32;
le_move_left_bt->event(event);
le_move_right_bt->event(event);
+ le_move_up_bt->event(event);
+ le_move_down_bt->event(event);
switch(le_move_left_bt->get_state())
{
case BUTTON_PRESSED:
- pos_x -= 192;
+ pos_x -= KEYBOARD_SPEED;
show_minimap = true;
break;
case BUTTON_HOVER:
- pos_x -= 32;
+ pos_x -= MOUSE_SPEED;
show_minimap = true;
break;
case BUTTON_CLICKED:
switch(le_move_right_bt->get_state())
{
case BUTTON_PRESSED:
- pos_x += 192;
+ pos_x += KEYBOARD_SPEED;
show_minimap = true;
break;
case BUTTON_HOVER:
- pos_x += 32;
+ pos_x += MOUSE_SPEED;
show_minimap = true;
break;
case BUTTON_CLICKED:
break;
}
+ switch(le_move_up_bt->get_state())
+ {
+ case BUTTON_PRESSED:
+ pos_y -= KEYBOARD_SPEED;
+ show_minimap = true;
+ break;
+ case BUTTON_HOVER:
+ pos_y -= MOUSE_SPEED;
+ show_minimap = true;
+ break;
+ case BUTTON_CLICKED:
+ show_minimap = true;
+ break;
+ default:
+ break;
+ }
+
+ switch(le_move_down_bt->get_state())
+ {
+ case BUTTON_PRESSED:
+ pos_y += KEYBOARD_SPEED;
+ show_minimap = true;
+ break;
+ case BUTTON_HOVER:
+ pos_y += MOUSE_SPEED;
+ show_minimap = true;
+ break;
+ case BUTTON_CLICKED:
+ show_minimap = true;
+ break;
+ default:
+ break;
+ }
+
+ /* checking if pos_x and pos_y is within the limits... */
+ if(pos_x > (le_world->get_level()->width * 32 + 32*2) - screen->w)
+ pos_x = (le_world->get_level()->width * 32 + 32*2) - screen->w;
+ if(pos_x < 0)
+ pos_x = 0;
+
+ if(pos_y > (le_world->get_level()->height * 32) - screen->h)
+ pos_y = (le_world->get_level()->height * 32) - screen->h;
+ if(pos_y < 0)
+ pos_y = 0;
+
}
}
y1 /= 32;
y2 /= 32;
- fillrect(x1*32-pos_x, y1*32,32* (x2 - x1 + 1),32 * (y2 - y1 + 1),173,234,177,103);
+ fillrect(x1*32-pos_x, y1*32-pos_y,32* (x2 - x1 + 1),32 * (y2 - y1 + 1),173,234,177,103);
}
void le_change(float x, float y, int tm, unsigned int c)
void le_showhelp()
{
bool tmp_show_grid = le_show_grid;
+ SelectionMode temp_le_selection_mode = le_selection_mode;
+ le_selection_mode = NONE;
show_selections = true;
le_show_grid = false;
le_help_shown = true;
show_selections = true;
le_show_grid = tmp_show_grid;
+ le_selection_mode = temp_le_selection_mode;
le_help_shown = false;
}
projects / supertux.git / blobdiff