Changeset 752
- Timestamp:
- Apr 4, 2011, 2:05:49 AM (10 years ago)
- Location:
- trunk/monsterz
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/monsterz/board.cpp
r746 r752 43 43 int minnpieces, npieces, maxnpieces; 44 44 45 int board, tiles, icons;45 int screen, board, tiles, icons; 46 46 int click, whip; 47 47 … … 105 105 data->npieces = minnpieces; 106 106 data->maxnpieces = maxnpieces; 107 data->screen = Tiler::Register(PNG_BACKGROUND, vec2i(640, 480), 0, 1.0f); 107 108 data->board = Tiler::Register(PNG_BOARD, 384, 0, 1.0f); 108 109 data->tiles = Tiler::Register(PNG_TILES, data->size, 0, 1.0f); … … 367 368 Scene::GetDefault()->AddTile((data->board << 16) | 0, 368 369 position.x, position.y, 1, 0); 370 Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 10, 0); 369 371 370 372 switch (data->game) … … 847 849 * scheduled its sprites! */ 848 850 Ticker::Unref(data->emitter); 851 Tiler::Deregister(data->screen); 849 852 Tiler::Deregister(data->board); 850 853 Tiler::Deregister(data->tiles); -
trunk/monsterz/interface.cpp
r750 r752 37 37 Title *title; 38 38 Board *board; 39 int screen,tiles;39 int tiles; 40 40 41 41 enum … … 57 57 data->title = NULL; 58 58 data->board = NULL; 59 data->screen = Tiler::Register(PNG_BACKGROUND, vec2i(640, 480), 0, 1.0f);60 59 data->tiles = Tiler::Register(PNG_TILES, 48, 0, 1.0f); 61 60 data->state = InterfaceData::INIT; … … 101 100 vec2i mouse = Input::GetMousePos(); 102 101 103 Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 10, 0);104 105 102 if (Platform::GetMouseCount() && mouse.x >= 0 && mouse.y >= 0) 106 103 { … … 117 114 Ticker::Unref(data->board); 118 115 Tiler::Deregister(data->tiles); 119 Tiler::Deregister(data->screen);120 116 delete data; 121 117 }
Note: See TracChangeset
for help on using the changeset viewer.