Menu
▾
▴
[svn] freesynd briefmenu.cpp, 1.7, 1.8 gameplaymenu.cpp, 1.24, 1.25 mapmenu.cpp, 1.11, 1.12 ped.cpp, 1.26, 1.27 researchmenu.cpp, 1.8, 1.9 screen.cpp, 1.16, 1.17 selectmenu.cpp, 1.19, 1.20
|
From: Trent W. <qua...@us...> - 2006-09-29 04:44:51
|
Update of /cvsroot/freesynd/freesynd In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6367 Modified Files: briefmenu.cpp gameplaymenu.cpp mapmenu.cpp ped.cpp researchmenu.cpp screen.cpp selectmenu.cpp Log Message: replace 640 and 400 with appropriate constants. Index: briefmenu.cpp =================================================================== RCS file: /cvsroot/freesynd/freesynd/briefmenu.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- briefmenu.cpp 22 Sep 2006 04:44:07 -0000 1.7 +++ briefmenu.cpp 29 Sep 2006 04:44:44 -0000 1.8 @@ -57,10 +57,10 @@ void BriefMenu::handleShow() { if (orig_pixels_ == 0) { - orig_pixels_ = new uint8[640*400]; - memcpy(orig_pixels_, g_Screen.pixels(), 640 * 400); + orig_pixels_ = new uint8[GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT]; + memcpy(orig_pixels_, g_Screen.pixels(), GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT); } else - g_Screen.blit(0, 0, 500, 340, orig_pixels_, false, 640); + g_Screen.blit(0, 0, 500, 340, orig_pixels_, false, GAME_SCREEN_WIDTH); g_Screen.drawLogo(18, 14, g_App.logo(), g_App.logoColour()); @@ -139,19 +139,19 @@ // write money char tmp[100]; - g_Screen.blit(502, 87, 125, 30, orig_pixels_ + 502 + 87 * 640, false, 640); + g_Screen.blit(502, 87, 125, 30, orig_pixels_ + 502 + 87 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); sprintf(tmp, "%d", g_App.money()); g_App.fonts().drawText(560 - g_App.fonts().textWidth(tmp, 1) / 2, 87, tmp, 1, false); // write cost for more info - g_Screen.blit(538, 140, 100, 30, orig_pixels_ + 538 + 140 * 640, false, 640); + g_Screen.blit(538, 140, 100, 30, orig_pixels_ + 538 + 140 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); if (info_level_ < 3) { sprintf(tmp, "%d", mission_->infoCost(info_level_)); g_App.fonts().drawText(560 - g_App.fonts().textWidth(tmp, 1) / 2, 140, tmp, 1, false); } // write cost for more enhance - g_Screen.blit(538, 195, 100, 30, orig_pixels_ + 538 + 195 * 640, false, 640); + g_Screen.blit(538, 195, 100, 30, orig_pixels_ + 538 + 195 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); if (enhance_level_ < 3) { sprintf(tmp, "%d", mission_->enhanceCost(enhance_level_)); g_App.fonts().drawText(560 - g_App.fonts().textWidth(tmp, 1) / 2, 195, tmp, 1, false); Index: gameplaymenu.cpp =================================================================== RCS file: /cvsroot/freesynd/freesynd/gameplaymenu.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- gameplaymenu.cpp 29 Sep 2006 01:52:40 -0000 1.24 +++ gameplaymenu.cpp 29 Sep 2006 04:44:44 -0000 1.25 @@ -38,7 +38,6 @@ } int inc = 16; -bool stuck_on = false; void GameplayMenu::handleTick() { @@ -63,10 +62,10 @@ change = true; } } - if (last_motion_x_ > 635 || stuck_on) { + if (last_motion_x_ > 635) { int newScrollX = scroll_x_ + inc; - if (newScrollX > mission_->mapWidth() - 640) - newScrollX = mission_->mapWidth() - 640; + if (newScrollX > mission_->mapWidth() - GAME_SCREEN_WIDTH) + newScrollX = mission_->mapWidth() - GAME_SCREEN_WIDTH; if (isScrollLegal(newScrollX, scroll_y_)) { scroll_x_ = newScrollX; change = true; @@ -74,8 +73,8 @@ } if (last_motion_y_ > 395) { int newScrollY = scroll_y_ + inc; - if (newScrollY > mission_->mapHeight() - 400) - newScrollY = mission_->mapHeight() - 400; + if (newScrollY > mission_->mapHeight() - GAME_SCREEN_HEIGHT) + newScrollY = mission_->mapHeight() - GAME_SCREEN_HEIGHT; if (isScrollLegal(scroll_x_, newScrollY)) { scroll_y_ = newScrollY; change = true; @@ -164,11 +163,11 @@ int x = 0, y = 0, my = 0; for (int i = 1601; i < g_App.gameSprites().spriteCount(); i++) { Sprite *s = g_App.gameSprites().sprite(i); - if (y + s->height() > 400) { + if (y + s->height() > GAME_SCREEN_HEIGHT) { printf("last sprite %i\n", i - 1); break; } - if (x + s->width() > 640) { + if (x + s->width() > GAME_SCREEN_WIDTH) { x = 0; y += my; my = 0; @@ -352,9 +351,6 @@ if (key == KEY_SPACE) printf("dir %i speed %i\n", mission_->ped(0)->direction(), mission_->ped(0)->speed()); - if (key == KEY_s) - stuck_on = true; - if (key == KEY_o) topz++; if (key == KEY_l) @@ -373,6 +369,8 @@ g_App.gameSprites().sprite(selected_agent_ & 4 ? 1774 : 1752)->draw(0, 46 + 44 + 10, 0); g_App.gameSprites().sprite(selected_agent_ & 8 ? 1775 : 1753)->draw(64, 46 + 44 + 10, 0); + + // TODO: draw health bars } void GameplayMenu::drawPerformanceMeters() @@ -419,6 +417,8 @@ if (a->selectedWeapon() == i + j * 4) s += 40; g_App.gameSprites().sprite(s)->draw(32 * i, 46 + 44 + 10 + 46 + 44 + 15 + j * 32, 0); + + // TODO: draw ammo bars } } } Index: ped.cpp =================================================================== RCS file: /cvsroot/freesynd/freesynd/ped.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ped.cpp 29 Sep 2006 01:52:40 -0000 1.26 +++ ped.cpp 29 Sep 2006 04:44:44 -0000 1.27 @@ -389,7 +389,7 @@ bool isOnScreen(int scrollX, int scrollY, int x, int y) { - return x >= scrollX && y >= scrollY && x < scrollX + 640 - 129 && y < scrollY + 480; + return x >= scrollX && y >= scrollY && x < scrollX + GAME_SCREEN_WIDTH - 129 && y < scrollY + GAME_SCREEN_HEIGHT; } bool getOnScreen(int scrollX, int scrollY, int &x, int &y, int tx, int ty) Index: selectmenu.cpp =================================================================== RCS file: /cvsroot/freesynd/freesynd/selectmenu.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- selectmenu.cpp 26 Sep 2006 11:24:40 -0000 1.19 +++ selectmenu.cpp 29 Sep 2006 04:44:44 -0000 1.20 @@ -174,12 +174,12 @@ } // restore lines over agent - g_Screen.blit(254, 124, 30, 2, orig_pixels_ + 256 + 124 * 640, false, 640); - g_Screen.blit(264, 132, 30, 2, orig_pixels_ + 266 + 132 * 640, false, 640); - g_Screen.blit(266, 174, 36, 2, orig_pixels_ + 268 + 174 * 640, false, 640); - g_Screen.blit(252, 210, 56, 2, orig_pixels_ + 254 + 210 * 640, false, 640); - g_Screen.blit(302, 232, 10, 2, orig_pixels_ + 304 + 232 * 640, false, 640); - g_Screen.blit(264, 256, 30, 2, orig_pixels_ + 266 + 256 * 640, false, 640); + g_Screen.blit(254, 124, 30, 2, orig_pixels_ + 256 + 124 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); + g_Screen.blit(264, 132, 30, 2, orig_pixels_ + 266 + 132 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); + g_Screen.blit(266, 174, 36, 2, orig_pixels_ + 268 + 174 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); + g_Screen.blit(252, 210, 56, 2, orig_pixels_ + 254 + 210 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); + g_Screen.blit(302, 232, 10, 2, orig_pixels_ + 304 + 232 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); + g_Screen.blit(264, 256, 30, 2, orig_pixels_ + 266 + 256 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); // write inventory for (int j = 0; j < 2; j++) @@ -248,18 +248,18 @@ } if (orig_pixels_ == 0) { - orig_pixels_ = new uint8[640*400]; - memcpy(orig_pixels_, g_Screen.pixels(), 640 * 400); + orig_pixels_ = new uint8[GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT]; + memcpy(orig_pixels_, g_Screen.pixels(), GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT); } else { - g_Screen.blit(0, 0, 145, 230, orig_pixels_, false, 640); - g_Screen.blit(145, 0, 640 - 145, 400, orig_pixels_ + 145, false, 640); + g_Screen.blit(0, 0, 145, 230, orig_pixels_, false, GAME_SCREEN_WIDTH); + g_Screen.blit(145, 0, GAME_SCREEN_WIDTH - 145, GAME_SCREEN_HEIGHT, orig_pixels_ + 145, false, GAME_SCREEN_WIDTH); } g_Screen.drawLogo(18, 14, g_App.logo(), g_App.logoColour()); // write money char tmp[100]; - g_Screen.blit(538, 87, 100, 30, orig_pixels_ + 538 + 87 * 640, false, 640); + g_Screen.blit(538, 87, 100, 30, orig_pixels_ + 538 + 87 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); sprintf(tmp, "%d", g_App.money()); g_App.fonts().drawText(560 - g_App.fonts().textWidth(tmp, 1) / 2, 87, tmp, 1, false); Index: screen.cpp =================================================================== RCS file: /cvsroot/freesynd/freesynd/screen.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- screen.cpp 27 Sep 2006 04:49:13 -0000 1.16 +++ screen.cpp 29 Sep 2006 04:44:44 -0000 1.17 @@ -201,7 +201,7 @@ dx = sx * dx + 1; dy = sy * dy + 1; pixx = 1; - pixy = 640; + pixy = GAME_SCREEN_WIDTH; pixel = pixels_ + pixx * (int) x1 + pixy * (int) y1; pixx *= sx; pixy *= sy; Index: researchmenu.cpp =================================================================== RCS file: /cvsroot/freesynd/freesynd/researchmenu.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- researchmenu.cpp 21 Sep 2006 00:16:07 -0000 1.8 +++ researchmenu.cpp 29 Sep 2006 04:44:44 -0000 1.9 @@ -124,18 +124,18 @@ } if (orig_pixels_ == 0) { - orig_pixels_ = new uint8[640*400]; - memcpy(orig_pixels_, g_Screen.pixels(), 640 * 400); + orig_pixels_ = new uint8[GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT]; + memcpy(orig_pixels_, g_Screen.pixels(), GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT); } else { - g_Screen.blit(0, 0, 145, 230, orig_pixels_, false, 640); - g_Screen.blit(145, 0, 640 - 145, 400, orig_pixels_ + 145, false, 640); + g_Screen.blit(0, 0, 145, 230, orig_pixels_, false, GAME_SCREEN_WIDTH); + g_Screen.blit(145, 0, GAME_SCREEN_WIDTH - 145, GAME_SCREEN_HEIGHT, orig_pixels_ + 145, false, GAME_SCREEN_WIDTH); } g_Screen.drawLogo(18, 14, g_App.logo(), g_App.logoColour()); // write money char tmp[100]; - g_Screen.blit(538, 87, 100, 30, orig_pixels_ + 538 + 87 * 640, false, 640); + g_Screen.blit(538, 87, 100, 30, orig_pixels_ + 538 + 87 * GAME_SCREEN_WIDTH, false, GAME_SCREEN_WIDTH); sprintf(tmp, "%d", g_App.money()); g_App.fonts().drawText(560 - g_App.fonts().textWidth(tmp, 1) / 2, 87, tmp, 1, false); Index: mapmenu.cpp =================================================================== RCS file: /cvsroot/freesynd/freesynd/mapmenu.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- mapmenu.cpp 27 Sep 2006 04:49:13 -0000 1.11 +++ mapmenu.cpp 29 Sep 2006 04:44:44 -0000 1.12 @@ -200,10 +200,10 @@ void MapMenu::handleShow() { if (orig_pixels_ == 0) { - orig_pixels_ = new uint8[640 * 400]; - memcpy(orig_pixels_, g_Screen.pixels(), 640 * 400); + orig_pixels_ = new uint8[GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT]; + memcpy(orig_pixels_, g_Screen.pixels(), GAME_SCREEN_WIDTH * GAME_SCREEN_HEIGHT); } else { - g_Screen.blit(0, 0, 640, 345, orig_pixels_); + g_Screen.blit(0, 0, GAME_SCREEN_WIDTH, 345, orig_pixels_); } for (int i = 0; i < 50; i++) { |