[Scummvm-git-logs] scummvm master -> 4c3b1577263bc7cca6f0ea8132d32be9f9d23606
aquadran
aquadran at gmail.com
Sat Mar 13 13:31:55 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4c3b157726 ICB: Cleanup
Commit: 4c3b1577263bc7cca6f0ea8132d32be9f9d23606
https://github.com/scummvm/scummvm/commit/4c3b1577263bc7cca6f0ea8132d32be9f9d23606
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-03-13T14:31:49+01:00
Commit Message:
ICB: Cleanup
Changed paths:
engines/icb/actor_view_pc.cpp
engines/icb/common/px_common.h
engines/icb/options_manager_pc.cpp
engines/icb/options_manager_pc.h
engines/icb/surface_manager.h
diff --git a/engines/icb/actor_view_pc.cpp b/engines/icb/actor_view_pc.cpp
index 41fa55a5f3..b78a29e862 100644
--- a/engines/icb/actor_view_pc.cpp
+++ b/engines/icb/actor_view_pc.cpp
@@ -584,8 +584,6 @@ void AutoCycleLight() {
}
}
- // Now fuck with the colours a bit
-
// Red component
if (av_autoR) {
av_LightR += 3;
diff --git a/engines/icb/common/px_common.h b/engines/icb/common/px_common.h
index 631c0d0426..c51a2c42e5 100644
--- a/engines/icb/common/px_common.h
+++ b/engines/icb/common/px_common.h
@@ -99,7 +99,7 @@ enum _file_type {
#define STANDARD_HEADER_NAME_LENGTH 32 // Max length of the header name
class px_standard_header {
- public:
+public:
int32 version; // This is incremented every time the object is updated
_file_type type; // enumerated value for every type of object in the game
int32 owner; // Who is responsible for producing this object
diff --git a/engines/icb/options_manager_pc.cpp b/engines/icb/options_manager_pc.cpp
index 1cd8b63ffc..d075896c16 100644
--- a/engines/icb/options_manager_pc.cpp
+++ b/engines/icb/options_manager_pc.cpp
@@ -259,7 +259,6 @@ void SaveThumbnail(uint32 slot_id) {
if (!g_thumbSurfaceID)
Fatal_error("SaveThumbnail() cannot save a null surface");
- // Now lock the fucker
// Lock the directdraw surface (working buffer)
uint8 *surface_address = surface_manager->Lock_surface(g_thumbSurfaceID);
uint32 pitch = surface_manager->Get_pitch(g_thumbSurfaceID);
@@ -300,7 +299,6 @@ void LoadThumbnail(uint32 slot_id, uint32 to_surface_id) {
if (!to_surface_id)
Fatal_error("LoadThumbnail() cannot read to a null surface");
- // Now lock the fucker
// Lock the directdraw surface (working buffer)
uint8 *surface_address = surface_manager->Lock_surface(to_surface_id);
uint32 pitch = surface_manager->Get_pitch(to_surface_id);
@@ -348,7 +346,6 @@ void LoadAMovieShot(uint32 slot_id, uint32 to_surface_id) {
if (!to_surface_id)
Fatal_error("LoadAMovieShot() cannot read to a null surface");
- // Now lock the fucker
uint8 *surface_address = surface_manager->Lock_surface(to_surface_id);
uint32 pitch = surface_manager->Get_pitch(to_surface_id);
@@ -484,7 +481,7 @@ OptionsManager::OptionsManager() {
m_slotBoundingRect.top = 128;
m_slotBoundingRect.bottom = 375;
- m_slotsFuckOffBy = 0;
+ m_slotsAnimOffBy = 0;
m_pageOn_from.left = m_pageOn_from.right = m_pageOn_from.bottom = m_pageOn_from.top = 0;
m_pageOn_dest.left = m_pageOn_dest.right = m_pageOn_dest.bottom = m_pageOn_dest.top = 0;
m_pageOff_from.left = m_pageOff_from.right = m_pageOff_from.bottom = m_pageOff_from.top = 0;
@@ -1204,7 +1201,7 @@ void OptionsManager::DrawGameOverScreen() {
DisplayText(ad, pitch, msg, 0, 170, (m_GAMEOVER_selected == RESTART) ? SELECTEDFONT : NORMALFONT, TRUE8);
msg = GetTextFromReference(HashString("opt_quit"));
- DisplayText(ad, pitch, msg, 0, 190, (m_GAMEOVER_selected == FUCKTHAT) ? SELECTEDFONT : NORMALFONT, TRUE8);
+ DisplayText(ad, pitch, msg, 0, 190, (m_GAMEOVER_selected == GAMEOVER) ? SELECTEDFONT : NORMALFONT, TRUE8);
surface_manager->Unlock_surface(working_buffer_id);
@@ -2662,7 +2659,7 @@ void OptionsManager::OnEscapeKey() {
m_IG_TOP_selected = CONTINUE;
break;
case GAME_OVER:
- m_GAMEOVER_selected = FUCKTHAT;
+ m_GAMEOVER_selected = GAMEOVER;
break;
// Do nothing for (critical) menus not in the list ie quit confirm screens
@@ -3251,7 +3248,7 @@ void OptionsManager::DoChoice() {
m_thatsEnoughTa = TRUE8;
break;
- case FUCKTHAT:
+ case GAMEOVER:
m_activeMenu = DEAD_QUIT;
m_QUIT_selected = NO;
break;
@@ -3262,7 +3259,7 @@ void OptionsManager::DoChoice() {
switch (m_QUIT_selected) {
case NO:
m_activeMenu = GAME_OVER;
- m_GAMEOVER_selected = FUCKTHAT;
+ m_GAMEOVER_selected = GAMEOVER;
break;
case YES:
m_thatsEnoughTa = TRUE8;
@@ -4548,7 +4545,6 @@ void OptionsManager::GetKeyAssignment() {
if (m_configLimiter) {
// Now allowed to assign a button
m_configLimiter = FALSE8;
- // Hacky fuck fuck!
g_system->delayMillis(200);
return;
}
@@ -4851,10 +4847,9 @@ void OptionsManager::AnimateSlotsPaging() {
surface_manager->Blit_surface_to_surface(m_mySlotSurface1ID, working_buffer_id, &m_pageOn_from, &m_pageOn_dest, DDBLT_KEYSRC);
}
- // Now for the page that's fucking off the screen to the right
surface_manager->Fill_surface(m_mySlotSurface1ID, m_colourKey);
- m_pageOff_dest.left += m_slotsFuckOffBy * inc;
+ m_pageOff_dest.left += m_slotsAnimOffBy * inc;
m_pageOff_dest.right = m_pageOff_dest.left + boxWidth;
if (m_pageOff_dest.right > SCREEN_WIDTH - 1) {
@@ -4879,7 +4874,7 @@ void OptionsManager::AnimateSlotsPaging() {
if (m_pageOn_dest.right == m_slotBoundingRect.right) {
// Stop animating and alter slot offset
m_paging = FALSE8;
- m_slotsFuckOffBy = 0;
+ m_slotsAnimOffBy = 0;
if (saveRestoreScreen) {
m_slotOffset -= NUMBER_OF_VISIBLE_GAME_SLOTS;
@@ -4899,7 +4894,7 @@ void OptionsManager::AnimateSlotsPaging() {
}
// Decrement counter
- m_slotsFuckOffBy++;
+ m_slotsAnimOffBy++;
} else {
// We want to increment the slot offset
@@ -4936,10 +4931,9 @@ void OptionsManager::AnimateSlotsPaging() {
surface_manager->Blit_surface_to_surface(m_mySlotSurface1ID, working_buffer_id, &m_pageOn_from, &m_pageOn_dest, DDBLT_KEYSRC);
}
- // Now for the page that's fucking off the screen to the right
surface_manager->Fill_surface(m_mySlotSurface1ID, m_colourKey);
- m_pageOff_dest.right -= m_slotsFuckOffBy * inc;
+ m_pageOff_dest.right -= m_slotsAnimOffBy * inc;
m_pageOff_dest.left = m_pageOff_dest.right - boxWidth;
if (m_pageOff_dest.left < 0) {
@@ -4963,7 +4957,7 @@ void OptionsManager::AnimateSlotsPaging() {
if (m_pageOn_dest.left == m_slotBoundingRect.left) {
// Stop animating and alter slot offset
m_paging = FALSE8;
- m_slotsFuckOffBy = 0;
+ m_slotsAnimOffBy = 0;
if (saveRestoreScreen) {
m_slotOffset += NUMBER_OF_VISIBLE_GAME_SLOTS;
@@ -4987,7 +4981,7 @@ void OptionsManager::AnimateSlotsPaging() {
}
// Decrement counter
- m_slotsFuckOffBy++;
+ m_slotsAnimOffBy++;
}
if (m_useDirtyRects) {
@@ -6272,7 +6266,6 @@ void LoadLogo(uint32 to_surface_id) {
if (!to_surface_id)
Fatal_error("LoadLogo() cannot read to a null surface");
- // Now lock the fucker
uint8 *surface_address = surface_manager->Lock_surface(to_surface_id);
uint32 pitch = surface_manager->Get_pitch(to_surface_id);
@@ -6504,7 +6497,6 @@ linesDone:
goto linesDone;
}
- // Now lock the fucker
uint8 *ad = surface_manager->Lock_surface(working_buffer_id);
uint32 pitch = surface_manager->Get_pitch(working_buffer_id);
diff --git a/engines/icb/options_manager_pc.h b/engines/icb/options_manager_pc.h
index f53ba862b2..4eb4a92c3f 100644
--- a/engines/icb/options_manager_pc.h
+++ b/engines/icb/options_manager_pc.h
@@ -240,7 +240,7 @@ enum M_PROFILES_CHOICES {
};
#define NUMBER_OF_GAMEOVER_CHOICES 3
-enum GAMEOVER_CHOICES { RESTORE = 0, RESTART = 1, FUCKTHAT = 2 };
+enum GAMEOVER_CHOICES { RESTORE = 0, RESTART = 1, GAMEOVER = 2 };
#define MAX_LABEL_LENGTH 24
@@ -362,7 +362,7 @@ private:
bool8 m_paging; // Are we currently paging (animating)
bool8 m_pageleft; // Left or right paging
LRECT m_slotBoundingRect; // Box containing the 10 visible slots
- int32 m_slotsFuckOffBy; // Animation step incrementer
+ int32 m_slotsAnimOffBy; // Animation step incrementer
LRECT m_pageOn_from; // Source blit rect for slots entering the screen
LRECT m_pageOn_dest; // Target blit rect for slots entering the screen
LRECT m_pageOff_from; // Source blit rect for slots leaving the screen
diff --git a/engines/icb/surface_manager.h b/engines/icb/surface_manager.h
index e7c80d2ed8..622916453f 100644
--- a/engines/icb/surface_manager.h
+++ b/engines/icb/surface_manager.h
@@ -35,10 +35,6 @@
#include "graphics/surface.h"
#include "graphics/pixelbuffer.h"
-namespace TinyGL {
-struct FrameBuffer;
-}
-
namespace ICB {
#define SURFACE_MANAGER_LOG "surface_manager_log.txt"
More information about the Scummvm-git-logs
mailing list