diff options
234 files changed, 5869 insertions, 5925 deletions
diff --git a/src/app/d3dapp.cpp b/src/app/d3dapp.cpp index fd7f148..6122feb 100644 --- a/src/app/d3dapp.cpp +++ b/src/app/d3dapp.cpp @@ -54,7 +54,7 @@ #define WINDOW_DX (640+6) // dimensions in windowed mode
#define WINDOW_DY (480+25)
-#define USE_THREAD FALSE // TRUE does not work!
+#define USE_THREAD false // true does not work!
#define TIME_THREAD 0.02f
@@ -141,15 +141,15 @@ CD3DApplication::CD3DApplication() m_axeJoy = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_vidMemTotal = 0;
- m_bActive = FALSE;
- m_bActivateApp = FALSE;
- m_bReady = FALSE;
- m_bJoystick = FALSE;
+ m_bActive = false;
+ m_bActivateApp = false;
+ m_bReady = false;
+ m_bJoystick = false;
m_aTime = 0.0f;
for ( i=0 ; i<32 ; i++ )
{
- m_bJoyButton[i] = FALSE;
+ m_bJoyButton[i] = false;
}
#if _NEWLOOK
@@ -157,14 +157,14 @@ CD3DApplication::CD3DApplication() #else
m_strWindowTitle = _T("COLOBOT");
#endif
- m_bAppUseZBuffer = TRUE;
- m_bAppUseStereo = TRUE;
- m_bShowStats = FALSE;
- m_bDebugMode = FALSE;
- m_bAudioState = TRUE;
- m_bAudioTrack = TRUE;
- m_bNiceMouse = FALSE;
- m_bSetupMode = TRUE;
+ m_bAppUseZBuffer = true;
+ m_bAppUseStereo = true;
+ m_bShowStats = false;
+ m_bDebugMode = false;
+ m_bAudioState = true;
+ m_bAudioTrack = true;
+ m_bNiceMouse = false;
+ m_bSetupMode = true;
m_fnConfirmDevice = 0;
ResetKey();
@@ -304,18 +304,18 @@ Error CD3DApplication::CheckMistery(char *strCmdLine) {
if ( strstr(strCmdLine, "-debug") != 0 )
{
- m_bShowStats = TRUE;
- SetDebugMode(TRUE);
+ m_bShowStats = true;
+ SetDebugMode(true);
}
if ( strstr(strCmdLine, "-audiostate") != 0 )
{
- m_bAudioState = FALSE;
+ m_bAudioState = false;
}
if ( strstr(strCmdLine, "-audiotrack") != 0 )
{
- m_bAudioTrack = FALSE;
+ m_bAudioTrack = false;
}
m_CDpath[0] = 0;
@@ -334,23 +334,23 @@ Error CD3DApplication::CheckMistery(char *strCmdLine) #if _SCHOOL & _EDU
if ( strstr(strCmdLine, "-nosetup") != 0 )
{
- m_bSetupMode = FALSE;
+ m_bSetupMode = false;
}
- m_bAudioTrack = FALSE;
+ m_bAudioTrack = false;
#endif
#if _SCHOOL & _PERSO
Error err = RegQuery();
if ( err != ERR_OK ) return err;
- m_bAudioTrack = FALSE;
+ m_bAudioTrack = false;
#endif
#if _SCHOOL & _CEEBOTDEMO
- m_bAudioTrack = FALSE;
+ m_bAudioTrack = false;
#endif
#if _NET
- m_bAudioTrack = FALSE;
+ m_bAudioTrack = false;
#endif
#if _DEMO
- m_bAudioTrack = FALSE;
+ m_bAudioTrack = false;
#endif
return ERR_OK;
@@ -364,42 +364,42 @@ int CD3DApplication::GetVidMemTotal() return m_vidMemTotal;
}
-BOOL CD3DApplication::IsVideo8MB()
+bool CD3DApplication::IsVideo8MB()
{
- if ( m_vidMemTotal == 0 ) return FALSE;
+ if ( m_vidMemTotal == 0 ) return false;
return (m_vidMemTotal <= 8388608L); // 8 Mb or less (2 ^ 23)?
}
-BOOL CD3DApplication::IsVideo32MB()
+bool CD3DApplication::IsVideo32MB()
{
- if ( m_vidMemTotal == 0 ) return FALSE;
+ if ( m_vidMemTotal == 0 ) return false;
return (m_vidMemTotal > 16777216L); // more than 16 Mb (2 ^ 24)?
}
-void CD3DApplication::SetShowStat(BOOL bShow)
+void CD3DApplication::SetShowStat(bool bShow)
{
m_bShowStats = bShow;
}
-BOOL CD3DApplication::RetShowStat()
+bool CD3DApplication::RetShowStat()
{
return m_bShowStats;
}
-void CD3DApplication::SetDebugMode(BOOL bMode)
+void CD3DApplication::SetDebugMode(bool bMode)
{
m_bDebugMode = bMode;
D3DTextr_SetDebugMode(m_bDebugMode);
}
-BOOL CD3DApplication::RetDebugMode()
+bool CD3DApplication::RetDebugMode()
{
return m_bDebugMode;
}
-BOOL CD3DApplication::RetSetupMode()
+bool CD3DApplication::RetSetupMode()
{
return m_bSetupMode;
}
@@ -417,7 +417,7 @@ DWORD WINAPI ThreadRoutine(LPVOID) ms = (int)(TIME_THREAD*1000.0f);
time = 0.0f;
- while ( TRUE )
+ while ( true )
{
start = timeGetTime();
@@ -470,7 +470,7 @@ HRESULT CD3DApplication::Create( HINSTANCE hInst, TCHAR* strCmdLine ) char modeName[100];
int iValue;
DWORD style;
- BOOL bFull, b3D;
+ bool bFull, b3D;
m_instance = hInst;
@@ -492,7 +492,7 @@ HRESULT CD3DApplication::Create( HINSTANCE hInst, TCHAR* strCmdLine ) if ( !m_bDebugMode )
{
- m_pDeviceInfo->bWindowed = FALSE; // full screen
+ m_pDeviceInfo->bWindowed = false; // full screen
}
if ( GetProfileInt("Device", "FullScreen", bFull) )
{
@@ -558,7 +558,7 @@ HRESULT CD3DApplication::Create( HINSTANCE hInst, TCHAR* strCmdLine ) if ( !GetProfileInt("Setup", "Sound3D", b3D) )
{
- b3D = TRUE;
+ b3D = true;
}
m_pSound->SetDebugMode(m_bDebugMode);
m_pSound->Create(m_hWnd, b3D);
@@ -587,7 +587,7 @@ HRESULT CD3DApplication::Create( HINSTANCE hInst, TCHAR* strCmdLine ) // First execution?
if ( !GetProfileInt("Setup", "ObjectDirty", iValue) )
{
- m_pD3DEngine->FirstExecuteAdapt(TRUE);
+ m_pD3DEngine->FirstExecuteAdapt(true);
}
// Creates the file colobot.ini at the first execution.
@@ -624,7 +624,7 @@ HRESULT CD3DApplication::Create( HINSTANCE hInst, TCHAR* strCmdLine ) #endif
// The app is ready to go
- m_bReady = TRUE;
+ m_bReady = true;
return S_OK;
}
@@ -638,7 +638,7 @@ INT CD3DApplication::Run() HACCEL hAccel = LoadAccelerators( NULL, MAKEINTRESOURCE(IDR_MAIN_ACCEL) );
// Now we're ready to recieve and process Windows messages.
- BOOL bGotMsg;
+ bool bGotMsg;
MSG msg;
PeekMessage( &msg, NULL, 0U, 0U, PM_NOREMOVE );
@@ -822,41 +822,41 @@ void CD3DApplication::SetMouseType(D3DMouse type) // Choice of mode for the mouse.
-void CD3DApplication::SetNiceMouse(BOOL bNice)
+void CD3DApplication::SetNiceMouse(bool bNice)
{
if ( bNice == m_bNiceMouse ) return;
m_bNiceMouse = bNice;
if ( m_bNiceMouse )
{
- ShowCursor(FALSE); // hides the ugly windows mouse
+ ShowCursor(false); // hides the ugly windows mouse
SetCursor(NULL);
}
else
{
- ShowCursor(TRUE); // shows the ugly windows mouse
+ ShowCursor(true); // shows the ugly windows mouse
SetCursor(LoadCursor(NULL, IDC_ARROW));
}
}
// Whether to use the mouse pretty shaded.
-BOOL CD3DApplication::RetNiceMouse()
+bool CD3DApplication::RetNiceMouse()
{
- if ( m_pDeviceInfo->bWindowed ) return FALSE;
- if ( !m_pDeviceInfo->bHardware ) return FALSE;
+ if ( m_pDeviceInfo->bWindowed ) return false;
+ if ( !m_pDeviceInfo->bHardware ) return false;
return m_bNiceMouse;
}
// Indicates whether it is possible to use the mouse pretty shaded.
-BOOL CD3DApplication::RetNiceMouseCap()
+bool CD3DApplication::RetNiceMouseCap()
{
- if ( m_pDeviceInfo->bWindowed ) return FALSE;
- if ( !m_pDeviceInfo->bHardware ) return FALSE;
+ if ( m_pDeviceInfo->bWindowed ) return false;
+ if ( !m_pDeviceInfo->bHardware ) return false;
- return TRUE;
+ return true;
}
@@ -1056,7 +1056,7 @@ int CD3DApplication::RetKey(int keyRank, int option) // Use the joystick or keyboard.
-void CD3DApplication::SetJoystick(BOOL bEnable)
+void CD3DApplication::SetJoystick(bool bEnable)
{
m_bJoystick = bEnable;
@@ -1064,23 +1064,23 @@ void CD3DApplication::SetJoystick(BOOL bEnable) {
if ( !InitDirectInput(m_instance, m_hWnd) ) // initialise joystick
{
- m_bJoystick = FALSE;
+ m_bJoystick = false;
}
else
{
- SetAcquire(TRUE);
+ SetAcquire(true);
SetTimer(m_hWnd, 0, 1000/30, NULL);
}
}
else // keyboard?
{
KillTimer(m_hWnd, 0);
- SetAcquire(FALSE);
+ SetAcquire(false);
FreeDirectInput();
}
}
-BOOL CD3DApplication::RetJoystick()
+bool CD3DApplication::RetJoystick()
{
return m_bJoystick;
}
@@ -1212,7 +1212,7 @@ LRESULT CD3DApplication::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, if( m_pDeviceInfo->bWindowed )
m_pFramework->ShowFrame();
else
- m_pFramework->FlipToGDISurface( TRUE );
+ m_pFramework->FlipToGDISurface( true );
}
break;
@@ -1226,11 +1226,11 @@ LRESULT CD3DApplication::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, // Check to see if we are losing our window...
if( SIZE_MAXHIDE==wParam || SIZE_MINIMIZED==wParam )
{
- m_bActive = FALSE;
+ m_bActive = false;
}
else
{
- m_bActive = TRUE;
+ m_bActive = true;
}
//? char s[100];
//? sprintf(s, "WM_SIZE %d %d %d\n", m_bActive, m_bReady, m_pDeviceInfo->bWindowed);
@@ -1240,13 +1240,13 @@ LRESULT CD3DApplication::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, // size, so the 3D structures must be changed accordingly.
if( m_bActive && m_bReady && m_pDeviceInfo->bWindowed )
{
- m_bReady = FALSE;
+ m_bReady = false;
//? OutputDebugString("WM_SIZE Change3DEnvironment\n");
if( FAILED( hr = Change3DEnvironment() ) )
return 0;
- m_bReady = TRUE;
+ m_bReady = true;
}
break;
@@ -1271,12 +1271,12 @@ LRESULT CD3DApplication::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, {
if ( js.rgbButtons[i] != 0 && !m_bJoyButton[i] )
{
- m_bJoyButton[i] = TRUE;
+ m_bJoyButton[i] = true;
PostMessage(m_hWnd, WM_KEYDOWN, VK_BUTTON1+i, 0);
}
if ( js.rgbButtons[i] == 0 && m_bJoyButton[i] )
{
- m_bJoyButton[i] = FALSE;
+ m_bJoyButton[i] = false;
PostMessage(m_hWnd, WM_KEYUP, VK_BUTTON1+i, 0);
}
}
@@ -1291,16 +1291,16 @@ LRESULT CD3DApplication::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_ACTIVATE:
if( LOWORD(wParam) == WA_INACTIVE )
{
- m_bActivateApp = FALSE;
+ m_bActivateApp = false;
}
else
{
- m_bActivateApp = TRUE;
+ m_bActivateApp = true;
}
if ( m_bActivateApp && m_bJoystick )
{
- SetAcquire(TRUE); // re-enables the joystick
+ SetAcquire(true); // re-enables the joystick
}
break;
@@ -1324,10 +1324,10 @@ LRESULT CD3DApplication::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_ENTERMENULOOP:
// Pause the app when menus are displayed
- Pause(TRUE);
+ Pause(true);
break;
case WM_EXITMENULOOP:
- Pause(FALSE);
+ Pause(false);
break;
case WM_ENTERSIZEMOVE:
@@ -1370,7 +1370,7 @@ LRESULT CD3DApplication::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, case SC_SIZE:
case SC_MAXIMIZE:
case SC_MONITORPOWER:
- if( FALSE == m_pDeviceInfo->bWindowed )
+ if( false == m_pDeviceInfo->bWindowed )
return 1;
break;
}
@@ -1383,23 +1383,23 @@ LRESULT CD3DApplication::MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, // Display the device-selection dialog box.
if( m_bActive && m_bReady )
{
- Pause(TRUE);
+ Pause(true);
if( SUCCEEDED( D3DEnum_UserChangeDevice( &m_pDeviceInfo ) ) )
{
if( FAILED( hr = Change3DEnvironment() ) )
return 0;
}
- Pause(FALSE);
+ Pause(false);
}
return 0;
case IDM_ABOUT:
// Display the About box
- Pause(TRUE);
+ Pause(true);
DialogBox( (HINSTANCE)GetWindowLong( hWnd, GWL_HINSTANCE ),
MAKEINTRESOURCE(IDD_ABOUT), hWnd, AboutProc );
- Pause(FALSE);
+ Pause(false);
return 0;
case IDM_EXIT:
@@ -1589,7 +1589,7 @@ HRESULT CD3DApplication::Change3DEnvironment() {
#if 0
HRESULT hr;
- static BOOL bOldWindowedState = TRUE;
+ static bool bOldWindowedState = true;
static DWORD dwSavedStyle;
static RECT rcSaved;
@@ -1668,7 +1668,7 @@ HRESULT CD3DApplication::Change3DEnvironment() if( m_pDeviceInfo->bWindowed )
{
- SetNiceMouse(FALSE); // hides the ugly windows mouse
+ SetNiceMouse(false); // hides the ugly windows mouse
}
return S_OK;
@@ -1769,8 +1769,8 @@ HRESULT CD3DApplication::Render3DEnvironment() VOID CD3DApplication::Cleanup3DEnvironment()
{
- m_bActive = FALSE;
- m_bReady = FALSE;
+ m_bActive = false;
+ m_bReady = false;
if( m_pFramework )
{
@@ -1802,19 +1802,19 @@ VOID CD3DApplication::DeleteDeviceObjects() // brings the GDI surface to the front of the display, so drawing
// output like message boxes and menus may be displayed.
-VOID CD3DApplication::Pause( BOOL bPause )
+VOID CD3DApplication::Pause( bool bPause )
{
static DWORD dwAppPausedCount = 0L;
dwAppPausedCount += ( bPause ? +1 : -1 );
- m_bReady = ( dwAppPausedCount ? FALSE : TRUE );
+ m_bReady = ( dwAppPausedCount ? false : true );
// Handle the first pause request (of many, nestable pause requests)
if( bPause && ( 1 == dwAppPausedCount ) )
{
// Get a surface for the GDI
if( m_pFramework )
- m_pFramework->FlipToGDISurface( TRUE );
+ m_pFramework->FlipToGDISurface( true );
// Stop the scene from animating
m_pD3DEngine->TimeEnterGel();
@@ -1836,8 +1836,8 @@ VOID CD3DApplication::Pause( BOOL bPause ) LRESULT CD3DApplication::OnQuerySuspend( DWORD dwFlags )
{
OutputDebugString("OnQuerySuspend\n");
- Pause(TRUE);
- return TRUE;
+ Pause(true);
+ return true;
}
@@ -1849,8 +1849,8 @@ LRESULT CD3DApplication::OnQuerySuspend( DWORD dwFlags ) LRESULT CD3DApplication::OnResumeSuspend( DWORD dwData )
{
OutputDebugString("OnResumeSuspend\n");
- Pause(FALSE);
- return TRUE;
+ Pause(false);
+ return true;
}
@@ -2082,7 +2082,7 @@ PBITMAPINFO CD3DApplication::CreateBitmapInfoStruct(HBITMAP hBmp) // retrieves the array of palette indices, opens the file, copies
// the data, and closes the file.
-BOOL CD3DApplication::CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC)
+bool CD3DApplication::CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC)
{
FILE* file; // file handle
BITMAPFILEHEADER hdr; // bitmap file-header
@@ -2092,17 +2092,17 @@ BOOL CD3DApplication::CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBM pbih = (PBITMAPINFOHEADER)pbi;
lpBits = (LPBYTE)GlobalAlloc(GMEM_FIXED, pbih->biSizeImage);
- if ( !lpBits ) return FALSE;
+ if ( !lpBits ) return false;
// Retrieve the color table (RGBQUAD array) and the bits
// (array of palette indices) from the DIB.
if ( !GetDIBits(hDC, hBMP, 0, (WORD)pbih->biHeight,
lpBits, pbi, DIB_RGB_COLORS) )
- return FALSE;
+ return false;
// Create the .BMP file.
file = fopen(pszFile, "wb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
hdr.bfType = 0x4d42; // 0x42 = "B" 0x4d = "M"
@@ -2134,12 +2134,12 @@ BOOL CD3DApplication::CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBM // Free memory.
GlobalFree((HGLOBAL)lpBits);
- return TRUE;
+ return true;
}
// Write a file. BMP screenshot.
-BOOL CD3DApplication::WriteScreenShot(char *filename, int width, int height)
+bool CD3DApplication::WriteScreenShot(char *filename, int width, int height)
{
D3DVIEWPORT7 vp;
HDC hDC;
@@ -2152,13 +2152,13 @@ BOOL CD3DApplication::WriteScreenShot(char *filename, int width, int height) dx = vp.dwWidth;
dy = vp.dwHeight;
- if ( FAILED(m_pddsRenderTarget->GetDC(&hDC)) ) return FALSE;
+ if ( FAILED(m_pddsRenderTarget->GetDC(&hDC)) ) return false;
hDCImage = CreateCompatibleDC(hDC);
if ( hDCImage == 0 )
{
m_pddsRenderTarget->ReleaseDC(hDC);
- return FALSE;
+ return false;
}
hb = CreateCompatibleBitmap(hDC, width, height);
@@ -2166,7 +2166,7 @@ BOOL CD3DApplication::WriteScreenShot(char *filename, int width, int height) {
DeleteDC(hDCImage);
m_pddsRenderTarget->ReleaseDC(hDC);
- return FALSE;
+ return false;
}
SelectObject(hDCImage, hb);
@@ -2178,7 +2178,7 @@ BOOL CD3DApplication::WriteScreenShot(char *filename, int width, int height) DeleteObject(hb);
DeleteDC(hDCImage);
m_pddsRenderTarget->ReleaseDC(hDC);
- return FALSE;
+ return false;
}
CreateBMPFile(filename, info, hb, hDCImage);
@@ -2186,24 +2186,24 @@ BOOL CD3DApplication::WriteScreenShot(char *filename, int width, int height) DeleteObject(hb);
DeleteDC(hDCImage);
m_pddsRenderTarget->ReleaseDC(hDC);
- return TRUE;
+ return true;
}
// Initializes an hDC on the rendering surface.
-BOOL CD3DApplication::GetRenderDC(HDC &hDC)
+bool CD3DApplication::GetRenderDC(HDC &hDC)
{
- if ( FAILED(m_pddsRenderTarget->GetDC(&hDC)) ) return FALSE;
- return TRUE;
+ if ( FAILED(m_pddsRenderTarget->GetDC(&hDC)) ) return false;
+ return true;
}
// Frees the hDC of the rendering surface.
-BOOL CD3DApplication::ReleaseRenderDC(HDC &hDC)
+bool CD3DApplication::ReleaseRenderDC(HDC &hDC)
{
m_pddsRenderTarget->ReleaseDC(hDC);
- return TRUE;
+ return true;
}
@@ -2214,7 +2214,7 @@ BOOL CD3DApplication::ReleaseRenderDC(HDC &hDC) // possible.
// buf* --> nom1<0> nom2<0> <0>
-BOOL CD3DApplication::EnumDevices(char *bufDevices, int lenDevices,
+bool CD3DApplication::EnumDevices(char *bufDevices, int lenDevices,
char *bufModes, int lenModes,
int &totalDevices, int &selectDevices,
int &totalModes, int &selectModes)
@@ -2272,20 +2272,20 @@ BOOL CD3DApplication::EnumDevices(char *bufDevices, int lenDevices, bufDevices[0] = 0;
totalDevices = numDevices;
- return TRUE;
+ return true;
}
// Indicates whether it is in full screen mode.
-BOOL CD3DApplication::RetFullScreen()
+bool CD3DApplication::RetFullScreen()
{
return !m_pDeviceInfo->bWindowed;
}
// Change the graphics mode.
-BOOL CD3DApplication::ChangeDevice(char *deviceName, char *modeName,
- BOOL bFull)
+bool CD3DApplication::ChangeDevice(char *deviceName, char *modeName,
+ bool bFull)
{
D3DEnum_DeviceInfo* pDeviceList;
D3DEnum_DeviceInfo* pDevice;
@@ -2318,24 +2318,24 @@ BOOL CD3DApplication::ChangeDevice(char *deviceName, char *modeName, pDevice->dwCurrentMode = mode;
pDevice->ddsdFullscreenMode = pDevice->pddsdModes[mode];
- m_bReady = FALSE;
+ m_bReady = false;
if ( FAILED( hr = Change3DEnvironment() ) )
{
- return FALSE;
+ return false;
}
SetProfileString("Device", "Name", deviceName);
SetProfileString("Device", "Mode", modeName);
SetProfileInt("Device", "FullScreen", bFull);
- m_bReady = TRUE;
- return TRUE;
+ m_bReady = true;
+ return true;
}
}
}
}
- return FALSE;
+ return false;
}
diff --git a/src/app/d3dapp.h b/src/app/d3dapp.h index fe4a3eb..a40dd1b 100644 --- a/src/app/d3dapp.h +++ b/src/app/d3dapp.h @@ -54,46 +54,46 @@ public: Error AudioQuery();
Error CheckMistery(char *strCmdLine);
int GetVidMemTotal();
- BOOL IsVideo8MB();
- BOOL IsVideo32MB();
+ bool IsVideo8MB();
+ bool IsVideo32MB();
HRESULT Create( HINSTANCE, TCHAR* );
INT Run();
LRESULT MsgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
- VOID Pause( BOOL bPause );
+ VOID Pause( bool bPause );
FPOINT ConvPosToInterface(HWND hWnd, LPARAM lParam);
void SetMousePos(FPOINT pos);
void StepSimul(float rTime);
char* RetCDpath();
- void SetShowStat(BOOL bShow);
- BOOL RetShowStat();
- void SetDebugMode(BOOL bMode);
- BOOL RetDebugMode();
- BOOL RetSetupMode();
+ void SetShowStat(bool bShow);
+ bool RetShowStat();
+ void SetDebugMode(bool bMode);
+ bool RetDebugMode();
+ bool RetSetupMode();
- BOOL EnumDevices(char *bufDevices, int lenDevices, char *bufModes, int lenModes, int &totalDevices, int &selectDevices, int &totalModes, int &selectModes);
- BOOL RetFullScreen();
- BOOL ChangeDevice(char *device, char *mode, BOOL bFull);
+ bool EnumDevices(char *bufDevices, int lenDevices, char *bufModes, int lenModes, int &totalDevices, int &selectDevices, int &totalModes, int &selectModes);
+ bool RetFullScreen();
+ bool ChangeDevice(char *device, char *mode, bool bFull);
void FlushPressKey();
void ResetKey();
void SetKey(int keyRank, int option, int key);
int RetKey(int keyRank, int option);
- void SetJoystick(BOOL bEnable);
- BOOL RetJoystick();
+ void SetJoystick(bool bEnable);
+ bool RetJoystick();
void SetMouseType(D3DMouse type);
- void SetNiceMouse(BOOL bNice);
- BOOL RetNiceMouse();
- BOOL RetNiceMouseCap();
+ void SetNiceMouse(bool bNice);
+ bool RetNiceMouse();
+ bool RetNiceMouseCap();
- BOOL WriteScreenShot(char *filename, int width, int height);
+ bool WriteScreenShot(char *filename, int width, int height);
- BOOL GetRenderDC(HDC &hDC);
- BOOL ReleaseRenderDC(HDC &hDC);
+ bool GetRenderDC(HDC &hDC);
+ bool ReleaseRenderDC(HDC &hDC);
PBITMAPINFO CreateBitmapInfoStruct(HBITMAP hBmp);
- BOOL CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC);
+ bool CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC);
protected:
HRESULT ConfirmDevice( DDCAPS* pddDriverCaps, D3DDEVICEDESC7* pd3dDeviceDesc );
@@ -130,21 +130,21 @@ protected: char m_CDpath[100];
CD3DFramework7* m_pFramework;
- BOOL m_bActive;
- BOOL m_bActivateApp;
- BOOL m_bReady;
- BOOL m_bJoystick;
+ bool m_bActive;
+ bool m_bActivateApp;
+ bool m_bReady;
+ bool m_bJoystick;
DWORD m_vidMemTotal;
TCHAR* m_strWindowTitle;
- BOOL m_bAppUseZBuffer;
- BOOL m_bAppUseStereo;
- BOOL m_bShowStats;
- BOOL m_bDebugMode;
- BOOL m_bAudioState;
- BOOL m_bAudioTrack;
- BOOL m_bNiceMouse;
- BOOL m_bSetupMode;
+ bool m_bAppUseZBuffer;
+ bool m_bAppUseStereo;
+ bool m_bShowStats;
+ bool m_bDebugMode;
+ bool m_bAudioState;
+ bool m_bAudioTrack;
+ bool m_bNiceMouse;
+ bool m_bSetupMode;
HRESULT (*m_fnConfirmDevice)(DDCAPS*, D3DDEVICEDESC7*);
public:
@@ -155,7 +155,7 @@ public: int m_keyState;
D3DVECTOR m_axeKey;
D3DVECTOR m_axeJoy;
- BOOL m_bJoyButton[32];
+ bool m_bJoyButton[32];
FPOINT m_mousePos;
DWORD m_mshMouseWheel;
diff --git a/src/app/joystick.cpp b/src/app/joystick.cpp index 91dc27f..8d617f7 100644 --- a/src/app/joystick.cpp +++ b/src/app/joystick.cpp @@ -41,7 +41,7 @@ DIDEVCAPS g_diDevCaps; // Called once for each enumerated joystick. If we find one, create a
// device interface on it so we can play with it.
-BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance,
+bool CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance,
VOID* pContext )
{
HRESULT hr;
@@ -64,7 +64,7 @@ BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, // Callback function for enumerating the axes on a joystick.
-BOOL CALLBACK EnumAxesCallback( const DIDEVICEOBJECTINSTANCE* pdidoi,
+bool CALLBACK EnumAxesCallback( const DIDEVICEOBJECTINSTANCE* pdidoi,
VOID* pContext )
{
DIPROPRANGE diprg;
@@ -116,7 +116,7 @@ BOOL CALLBACK EnumAxesCallback( const DIDEVICEOBJECTINSTANCE* pdidoi, // Initialize the DirectInput variables.
-BOOL InitDirectInput(HINSTANCE hInst, HWND hWnd)
+bool InitDirectInput(HINSTANCE hInst, HWND hWnd)
{
HRESULT hr;
@@ -124,22 +124,22 @@ BOOL InitDirectInput(HINSTANCE hInst, HWND hWnd) // to a IDirectInput interface we can use.
#ifndef __MINGW32__ // FIXME Doesn't work under MinGW
hr = DirectInputCreateEx( hInst, DIRECTINPUT_VERSION,IID_IDirectInput7, (LPVOID*)&g_pDI, NULL );
- if( FAILED(hr) ) return FALSE;
+ if( FAILED(hr) ) return false;
#else
- return FALSE;
+ return false;
#endif
// Look for a simple joystick we can use for this sample program.
hr = g_pDI->EnumDevices( DIDEVTYPE_JOYSTICK, EnumJoysticksCallback,
NULL, DIEDFL_ATTACHEDONLY );
- if( FAILED(hr) ) return FALSE;
+ if( FAILED(hr) ) return false;
// Make sure we got a joystick
if( NULL == g_pJoystick )
{
//? MessageBox( NULL, "Joystick not found", "DInput Sample",
//? MB_ICONERROR | MB_OK );
- return FALSE;
+ return false;
}
// Set the data format to "simple joystick" - a predefined data format
@@ -148,18 +148,18 @@ BOOL InitDirectInput(HINSTANCE hInst, HWND hWnd) // and how they should be reported. This tells DInput that we will be
// passing a DIJOYSTATE structure to IDirectInputDevice::GetDeviceState().
hr = g_pJoystick->SetDataFormat( &c_dfDIJoystick );
- if( FAILED(hr) ) return FALSE;
+ if( FAILED(hr) ) return false;
// Set the cooperative level to let DInput know how this device should
// interact with the system and with other DInput applications.
hr = g_pJoystick->SetCooperativeLevel( hWnd, DISCL_EXCLUSIVE|DISCL_FOREGROUND );
- if( FAILED(hr) ) return FALSE;
+ if( FAILED(hr) ) return false;
// Determine how many axis the joystick has (so we don't error out setting
// properties for unavailable axis)
g_diDevCaps.dwSize = sizeof(DIDEVCAPS);
hr = g_pJoystick->GetCapabilities(&g_diDevCaps);
- if( FAILED(hr) ) return FALSE;
+ if( FAILED(hr) ) return false;
// Enumerate the axes of the joyctick and set the range of each axis. Note:
@@ -167,26 +167,26 @@ BOOL InitDirectInput(HINSTANCE hInst, HWND hWnd) // of enumerating device objects (axes, buttons, etc.).
g_pJoystick->EnumObjects( EnumAxesCallback, (VOID*)g_pJoystick, DIDFT_AXIS );
- return TRUE;
+ return true;
}
// Acquire or unacquire the keyboard, depending on if the app is active
// Input device must be acquired before the GetDeviceState is called.
-BOOL SetAcquire(BOOL bActive)
+bool SetAcquire(bool bActive)
{
if ( g_pJoystick )
{
if( bActive ) g_pJoystick->Acquire();
else g_pJoystick->Unacquire();
}
- return TRUE;
+ return true;
}
// Get the input device's state and display it.
-BOOL UpdateInputState( DIJOYSTATE &js )
+bool UpdateInputState( DIJOYSTATE &js )
{
HRESULT hr;
@@ -196,7 +196,7 @@ BOOL UpdateInputState( DIJOYSTATE &js ) {
// Poll the device to read the current state
hr = g_pJoystick->Poll();
- if ( FAILED(hr) ) return FALSE;
+ if ( FAILED(hr) ) return false;
// Get the input's device state
hr = g_pJoystick->GetDeviceState( sizeof(DIJOYSTATE), &js );
@@ -208,19 +208,19 @@ BOOL UpdateInputState( DIJOYSTATE &js ) // we don't have any special reset that needs to be done. We
// just re-acquire and try again.
hr = g_pJoystick->Acquire();
- if ( FAILED(hr) ) return FALSE;
+ if ( FAILED(hr) ) return false;
}
}
while ( DIERR_INPUTLOST == hr );
- if ( FAILED(hr) ) return FALSE;
+ if ( FAILED(hr) ) return false;
}
- return TRUE;
+ return true;
}
// Initialize the DirectInput variables.
-BOOL FreeDirectInput()
+bool FreeDirectInput()
{
// Unacquire and release any DirectInputDevice objects.
if( NULL != g_pJoystick )
@@ -240,6 +240,6 @@ BOOL FreeDirectInput() g_pDI = NULL;
}
- return TRUE;
+ return true;
}
diff --git a/src/app/joystick.h b/src/app/joystick.h index d6904a3..44fd1c3 100644 --- a/src/app/joystick.h +++ b/src/app/joystick.h @@ -19,9 +19,9 @@ #pragma once
-extern BOOL InitDirectInput(HINSTANCE hInst, HWND hWnd);
-extern BOOL SetAcquire(BOOL bActive);
-extern BOOL UpdateInputState(DIJOYSTATE &js);
-extern BOOL FreeDirectInput();
+extern bool InitDirectInput(HINSTANCE hInst, HWND hWnd);
+extern bool SetAcquire(bool bActive);
+extern bool UpdateInputState(DIJOYSTATE &js);
+extern bool FreeDirectInput();
diff --git a/src/common/event.cpp b/src/common/event.cpp index 1c92a2a..1d56e8a 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -65,27 +65,27 @@ void CEvent::MakeEvent(Event &event, EventMsg msg) // Adds an event in the FIFO.
-BOOL CEvent::AddEvent(const Event &event)
+bool CEvent::AddEvent(const Event &event)
{
- if ( m_total >= MAXEVENT ) return FALSE;
+ if ( m_total >= MAXEVENT ) return false;
m_fifo[m_head++] = event;
if ( m_head >= MAXEVENT ) m_head = 0;
m_total ++;
- return TRUE;
+ return true;
}
// Removes an event from the FIFO.
-BOOL CEvent::GetEvent(Event &event)
+bool CEvent::GetEvent(Event &event)
{
- if ( m_head == m_tail ) return FALSE;
+ if ( m_head == m_tail ) return false;
event = m_fifo[m_tail++];
if ( m_tail >= MAXEVENT ) m_tail = 0;
m_total --;
- return TRUE;
+ return true;
}
diff --git a/src/common/event.h b/src/common/event.h index b9690e4..e2ec120 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -617,8 +617,8 @@ public: void Flush();
void MakeEvent(Event &event, EventMsg msg);
- BOOL AddEvent(const Event &event);
- BOOL GetEvent(Event &event);
+ bool AddEvent(const Event &event);
+ bool GetEvent(Event &event);
protected:
diff --git a/src/common/iman.cpp b/src/common/iman.cpp index b98c393..c6313e0 100644 --- a/src/common/iman.cpp +++ b/src/common/iman.cpp @@ -88,11 +88,11 @@ void CInstanceManager::Flush(ClassType classType) // Adds a new instance of a class.
-BOOL CInstanceManager::AddInstance(ClassType classType, void* pointer, int max)
+bool CInstanceManager::AddInstance(ClassType classType, void* pointer, int max)
{
int i;
- if ( classType < 0 || classType >= CLASS_MAX ) return FALSE;
+ if ( classType < 0 || classType >= CLASS_MAX ) return false;
if ( m_table[classType].classPointer == 0 )
{
@@ -101,20 +101,20 @@ BOOL CInstanceManager::AddInstance(ClassType classType, void* pointer, int max) m_table[classType].totalUsed = 0;
}
- if ( m_table[classType].totalUsed >= m_table[classType].totalPossible ) return FALSE;
+ if ( m_table[classType].totalUsed >= m_table[classType].totalPossible ) return false;
i = m_table[classType].totalUsed++;
m_table[classType].classPointer[i] = pointer;
- return TRUE;
+ return true;
}
// Deletes an instance of a class.
-BOOL CInstanceManager::DeleteInstance(ClassType classType, void* pointer)
+bool CInstanceManager::DeleteInstance(ClassType classType, void* pointer)
{
int i;
- if ( classType < 0 || classType >= CLASS_MAX ) return FALSE;
+ if ( classType < 0 || classType >= CLASS_MAX ) return false;
for ( i=0 ; i<m_table[classType].totalUsed ; i++ )
{
@@ -125,7 +125,7 @@ BOOL CInstanceManager::DeleteInstance(ClassType classType, void* pointer) }
Compress(classType);
- return TRUE;
+ return true;
}
// Seeking an existing instance. Returns 0 if it does not exist.
diff --git a/src/common/iman.h b/src/common/iman.h index b484e30..b41305f 100644 --- a/src/common/iman.h +++ b/src/common/iman.h @@ -41,8 +41,8 @@ public: void Flush();
void Flush(ClassType classType);
- BOOL AddInstance(ClassType classType, void* pointer, int max=1);
- BOOL DeleteInstance(ClassType classType, void* pointer);
+ bool AddInstance(ClassType classType, void* pointer, int max=1);
+ bool DeleteInstance(ClassType classType, void* pointer);
void* SearchInstance(ClassType classType, int rank=0);
diff --git a/src/common/language.h b/src/common/language.h index 9d5bdb9..33c7465 100644 --- a/src/common/language.h +++ b/src/common/language.h @@ -19,23 +19,23 @@ #pragma once
-#define _FULL TRUE // CoLoBoT
-#define _SCHOOL FALSE // CeeBot-A or Teen
- #define _TEEN FALSE // FALSE for CeeBot-A, TRUE for CeeBot-Teen
- #define _EDU FALSE
- #define _PERSO FALSE
- #define _CEEBOTDEMO FALSE
-#define _NET FALSE
-#define _DEMO FALSE // DEMO only CoLoBoT (with _Full = FALSE)!
-
-#define _FRENCH TRUE
-#define _ENGLISH FALSE
-#define _GERMAN FALSE
-#define _WG FALSE
-#define _POLISH FALSE
-
-#define _NEWLOOK FALSE // FALSE for CoLoBoT, TRUE for all CeeBot
-#define _SOUNDTRACKS FALSE // always FALSE since InitAudioTrackVolume crop in Vista
+#define _FULL true // CoLoBoT
+#define _SCHOOL false // CeeBot-A or Teen
+ #define _TEEN false // false for CeeBot-A, true for CeeBot-Teen
+ #define _EDU false
+ #define _PERSO false
+ #define _CEEBOTDEMO false
+#define _NET false
+#define _DEMO false // DEMO only CoLoBoT (with _Full = false)!
+
+#define _FRENCH true
+#define _ENGLISH false
+#define _GERMAN false
+#define _WG false
+#define _POLISH false
+
+#define _NEWLOOK false // false for CoLoBoT, true for all CeeBot
+#define _SOUNDTRACKS false // always false since InitAudioTrackVolume crop in Vista
// Verifications
diff --git a/src/common/metafile.cpp b/src/common/metafile.cpp index 63c8e0b..74bcc3d 100644 --- a/src/common/metafile.cpp +++ b/src/common/metafile.cpp @@ -138,8 +138,8 @@ CMetaFile::CMetaFile() m_list[i].headers = 0;
}
- m_bMeta = FALSE;
- m_bOpen = FALSE;
+ m_bMeta = false;
+ m_bOpen = false;
m_start = 0;
m_pos = 0;
m_len = 0;
@@ -156,7 +156,7 @@ CMetaFile::~CMetaFile() // Test if a file exists.
-BOOL CMetaFile::IsExist(char *metaname, char *filename)
+bool CMetaFile::IsExist(char *metaname, char *filename)
{
FILE* file;
int index, i;
@@ -164,9 +164,9 @@ BOOL CMetaFile::IsExist(char *metaname, char *filename) if ( metaname[0] == 0 )
{
file = fopen(filename, "rb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
fclose(file);
- return TRUE;
+ return true;
}
else
{
@@ -177,10 +177,10 @@ BOOL CMetaFile::IsExist(char *metaname, char *filename) {
if ( strcmp(m_list[index].headers[i].name, filename) == 0 )
{
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
}
@@ -199,8 +199,8 @@ int CMetaFile::Open(char *metaname, char *filename) {
m_stream = fopen(filename, "rb");
if ( m_stream == 0 ) return 1;
- m_bOpen = TRUE;
- m_bMeta = FALSE;
+ m_bOpen = true;
+ m_bMeta = false;
return 0;
}
else
@@ -215,8 +215,8 @@ int CMetaFile::Open(char *metaname, char *filename) m_stream = m_list[index].stream;
m_start = m_list[index].headers[i].start;
m_len = m_list[index].headers[i].len;
- m_bOpen = TRUE;
- m_bMeta = TRUE;
+ m_bOpen = true;
+ m_bMeta = true;
Seek(0);
return 0;
}
@@ -328,7 +328,7 @@ int CMetaFile::Close() {
fclose(m_stream);
}
- m_bOpen = FALSE;
+ m_bOpen = false;
m_stream = 0;
return 0;
diff --git a/src/common/metafile.h b/src/common/metafile.h index 7d7ec3e..c580f6a 100644 --- a/src/common/metafile.h +++ b/src/common/metafile.h @@ -49,7 +49,7 @@ public: CMetaFile();
~CMetaFile();
- BOOL IsExist(char *metaname, char *filename);
+ bool IsExist(char *metaname, char *filename);
int Open(char *metaname, char *filename);
int RetLength();
int Seek(int offset);
@@ -65,8 +65,8 @@ protected: protected:
MetaFile m_list[METAMAX]; // metafile open
- BOOL m_bOpen; // open file
- BOOL m_bMeta; // metafile open
+ bool m_bOpen; // open file
+ bool m_bMeta; // metafile open
FILE* m_stream; // channel
int m_start; // position from the beginning
int m_pos; // current position
diff --git a/src/common/misc.cpp b/src/common/misc.cpp index e73238f..f58527f 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp @@ -40,7 +40,7 @@ CMetaFile g_metafile;
static EventMsg g_uniqueEventMsg = EVENT_USER;
-static BOOL g_bUserDir = FALSE;
+static bool g_bUserDir = false;
static char g_userDir[100] = "";
@@ -264,7 +264,7 @@ void TimeToAscii(time_t time, char *buffer) // Makes a copy of a file.
-BOOL Xfer(char* src, char* dst)
+bool Xfer(char* src, char* dst)
{
FILE *fs, *fd;
char *buffer;
@@ -273,19 +273,19 @@ BOOL Xfer(char* src, char* dst) fs = fopen(src, "rb");
if ( fs == 0 )
{
- return FALSE;
+ return false;
}
fd = fopen(dst, "wb");
if ( fd == 0 )
{
fclose(fs);
- return FALSE;
+ return false;
}
buffer = (char*)malloc(10000);
- while ( TRUE )
+ while ( true )
{
len = fread(buffer, 1, 10000, fs);
if ( len == 0 ) break;
@@ -295,12 +295,12 @@ BOOL Xfer(char* src, char* dst) free(buffer);
fclose(fs);
fclose(fd);
- return TRUE;
+ return true;
}
// Copy a file into the temporary folder.
-BOOL CopyFileToTemp(char* filename)
+bool CopyFileToTemp(char* filename)
{
char src[100];
char dst[100];
@@ -314,15 +314,15 @@ BOOL CopyFileToTemp(char* filename) strcpy(g_userDir, save);
_mkdir("temp");
- if ( !Xfer(src, dst) ) return FALSE;
+ if ( !Xfer(src, dst) ) return false;
strcpy(filename, dst);
- return TRUE;
+ return true;
}
// Copy a list of numbered files into the temporary folder.
-BOOL CopyFileListToTemp(char* filename, int* list, int total)
+bool CopyFileListToTemp(char* filename, int* list, int total)
{
char name[100];
char ext[10];
@@ -355,7 +355,7 @@ BOOL CopyFileListToTemp(char* filename, int* list, int total) strcpy(filename, file);
strcpy(g_userDir, save);
- return TRUE;
+ return true;
}
@@ -370,7 +370,7 @@ void AddExt(char* filename, char* ext) // Specifies the user folder.
-void UserDir(BOOL bUser, char* dir)
+void UserDir(bool bUser, char* dir)
{
g_bUserDir = bUser;
strcpy(g_userDir, dir);
diff --git a/src/common/misc.h b/src/common/misc.h index fb1938e..93b57de 100644 --- a/src/common/misc.h +++ b/src/common/misc.h @@ -227,10 +227,10 @@ extern char RetToLower(char letter); extern void TimeToAscii(time_t time, char *buffer);
-extern BOOL CopyFileToTemp(char* filename);
-extern BOOL CopyFileListToTemp(char* filename, int* list, int total);
+extern bool CopyFileToTemp(char* filename);
+extern bool CopyFileListToTemp(char* filename, int* list, int total);
extern void AddExt(char* filename, char* ext);
-extern void UserDir(BOOL bUser, char* dir);
+extern void UserDir(bool bUser, char* dir);
extern void UserDir(char* buffer, char* dir, char* def);
extern char RetLanguageLetter();
diff --git a/src/common/modfile.cpp b/src/common/modfile.cpp index 3e1c997..a7bfeab 100644 --- a/src/common/modfile.cpp +++ b/src/common/modfile.cpp @@ -64,7 +64,7 @@ CModFile::~CModFile() // Creates a triangle in the internal structure.
-BOOL CModFile::CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3,
+bool CModFile::CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3,
float min, float max)
{
D3DVECTOR n;
@@ -73,15 +73,15 @@ BOOL CModFile::CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3, if ( m_triangleUsed >= MAX_VERTICES )
{
OutputDebugString("ERROR: CreateTriangle::Too many triangles\n");
- return FALSE;
+ return false;
}
i = m_triangleUsed++;
ZeroMemory(&m_triangleTable[i], sizeof(ModelTriangle));
- m_triangleTable[i].bUsed = TRUE;
- m_triangleTable[i].bSelect = FALSE;
+ m_triangleTable[i].bUsed = true;
+ m_triangleTable[i].bSelect = false;
n = ComputeNormal(p3, p2, p1);
m_triangleTable[i].p1 = D3DVERTEX2( p1, n);
@@ -98,42 +98,42 @@ BOOL CModFile::CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3, m_triangleTable[i].min = min;
m_triangleTable[i].max = max;
- return TRUE;
+ return true;
}
// Reads a DXF file.
-BOOL CModFile::ReadDXF(char *filename, float min, float max)
+bool CModFile::ReadDXF(char *filename, float min, float max)
{
FILE* file = NULL;
char line[100];
int command, rankSommet, nbSommet, nbFace;
D3DVECTOR table[MAX_VERTICES];
- BOOL bWaitNbSommet;
- BOOL bWaitNbFace;
- BOOL bWaitSommetX;
- BOOL bWaitSommetY;
- BOOL bWaitSommetZ;
- BOOL bWaitFaceX;
- BOOL bWaitFaceY;
- BOOL bWaitFaceZ;
+ bool bWaitNbSommet;
+ bool bWaitNbFace;
+ bool bWaitSommetX;
+ bool bWaitSommetY;
+ bool bWaitSommetZ;
+ bool bWaitFaceX;
+ bool bWaitFaceY;
+ bool bWaitFaceZ;
float x,y,z;
int p1,p2,p3;
file = fopen(filename, "r");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
m_triangleUsed = 0;
rankSommet = 0;
- bWaitNbSommet = FALSE;
- bWaitNbFace = FALSE;
- bWaitSommetX = FALSE;
- bWaitSommetY = FALSE;
- bWaitSommetZ = FALSE;
- bWaitFaceX = FALSE;
- bWaitFaceY = FALSE;
- bWaitFaceZ = FALSE;
+ bWaitNbSommet = false;
+ bWaitNbFace = false;
+ bWaitSommetX = false;
+ bWaitSommetY = false;
+ bWaitSommetZ = false;
+ bWaitFaceX = false;
+ bWaitFaceY = false;
+ bWaitFaceZ = false;
while ( fgets(line, 100, file) != NULL )
{
@@ -142,16 +142,16 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max) if ( command == 66 )
{
- bWaitNbSommet = TRUE;
+ bWaitNbSommet = true;
}
if ( command == 71 && bWaitNbSommet )
{
- bWaitNbSommet = FALSE;
+ bWaitNbSommet = false;
sscanf(line, "%d", &nbSommet);
if ( nbSommet > MAX_VERTICES ) nbSommet = MAX_VERTICES;
rankSommet = 0;
- bWaitNbFace = TRUE;
+ bWaitNbFace = true;
//? sprintf(s, "Waiting for %d sommets\n", nbSommet);
//? OutputDebugString(s);
@@ -159,9 +159,9 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max) if ( command == 72 && bWaitNbFace )
{
- bWaitNbFace = FALSE;
+ bWaitNbFace = false;
sscanf(line, "%d", &nbFace);
- bWaitSommetX = TRUE;
+ bWaitSommetX = true;
//? sprintf(s, "Waiting for %d faces\n", nbFace);
//? OutputDebugString(s);
@@ -169,21 +169,21 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max) if ( command == 10 && bWaitSommetX )
{
- bWaitSommetX = FALSE;
+ bWaitSommetX = false;
sscanf(line, "%f", &x);
- bWaitSommetY = TRUE;
+ bWaitSommetY = true;
}
if ( command == 20 && bWaitSommetY )
{
- bWaitSommetY = FALSE;
+ bWaitSommetY = false;
sscanf(line, "%f", &y);
- bWaitSommetZ = TRUE;
+ bWaitSommetZ = true;
}
if ( command == 30 && bWaitSommetZ )
{
- bWaitSommetZ = FALSE;
+ bWaitSommetZ = false;
sscanf(line, "%f", &z);
nbSommet --;
@@ -191,36 +191,36 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max) {
D3DVECTOR p(x,z,y); // permutation of Y and Z!
table[rankSommet++] = p;
- bWaitSommetX = TRUE;
+ bWaitSommetX = true;
//? sprintf(s, "Sommet[%d]=%f;%f;%f\n", rankSommet, p.x,p.y,p.z);
//? OutputDebugString(s);
}
else
{
- bWaitFaceX = TRUE;
+ bWaitFaceX = true;
}
}
if ( command == 71 && bWaitFaceX )
{
- bWaitFaceX = FALSE;
+ bWaitFaceX = false;
sscanf(line, "%d", &p1);
if ( p1 < 0 ) p1 = -p1;
- bWaitFaceY = TRUE;
+ bWaitFaceY = true;
}
if ( command == 72 && bWaitFaceY )
{
- bWaitFaceY = FALSE;
+ bWaitFaceY = false;
sscanf(line, "%d", &p2);
if ( p2 < 0 ) p2 = -p2;
- bWaitFaceZ = TRUE;
+ bWaitFaceZ = true;
}
if ( command == 73 && bWaitFaceZ )
{
- bWaitFaceZ = FALSE;
+ bWaitFaceZ = false;
sscanf(line, "%d", &p3);
if ( p3 < 0 ) p3 = -p3;
@@ -228,7 +228,7 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max) if ( nbFace >= 0 )
{
CreateTriangle( table[p3-1], table[p2-1], table[p1-1], min,max );
- bWaitFaceX = TRUE;
+ bWaitFaceX = true;
//? sprintf(s, "Face=%d;%d;%d\n", p1,p2,p3);
//? OutputDebugString(s);
@@ -238,7 +238,7 @@ BOOL CModFile::ReadDXF(char *filename, float min, float max) }
fclose(file);
- return TRUE;
+ return true;
}
@@ -266,7 +266,7 @@ void ChangeBMPtoTGA(char *filename) // Reads a MOD file.
-BOOL CModFile::AddModel(char *filename, int first, BOOL bEdit, BOOL bMeta)
+bool CModFile::AddModel(char *filename, int first, bool bEdit, bool bMeta)
{
FILE* file;
InfoMOD info;
@@ -276,7 +276,7 @@ BOOL CModFile::AddModel(char *filename, int first, BOOL bEdit, BOOL bMeta) if ( m_engine->RetDebugMode() )
{
- bMeta = FALSE;
+ bMeta = false;
}
if ( bMeta )
@@ -298,12 +298,12 @@ BOOL CModFile::AddModel(char *filename, int first, BOOL bEdit, BOOL bMeta) err = g_metafile.Open("colobot2.dat", p+1);
#endif
}
- if ( err != 0 ) bMeta = FALSE;
+ if ( err != 0 ) bMeta = false;
}
if ( !bMeta )
{
file = fopen(filename, "rb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
}
if ( bMeta )
@@ -477,12 +477,12 @@ BOOL CModFile::AddModel(char *filename, int first, BOOL bEdit, BOOL bMeta) {
fclose(file);
}
- return TRUE;
+ return true;
}
// Reads a MOD file.
-BOOL CModFile::ReadModel(char *filename, BOOL bEdit, BOOL bMeta)
+bool CModFile::ReadModel(char *filename, bool bEdit, bool bMeta)
{
m_triangleUsed = 0;
return AddModel(filename, 0, bEdit, bMeta);
@@ -491,15 +491,15 @@ BOOL CModFile::ReadModel(char *filename, BOOL bEdit, BOOL bMeta) // Writes a MOD file.
-BOOL CModFile::WriteModel(char *filename)
+bool CModFile::WriteModel(char *filename)
{
FILE* file;
InfoMOD info;
- if ( m_triangleUsed == 0 ) return FALSE;
+ if ( m_triangleUsed == 0 ) return false;
file = fopen(filename, "wb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
ZeroMemory(&info, sizeof(InfoMOD));
info.rev = 1;
@@ -510,13 +510,13 @@ BOOL CModFile::WriteModel(char *filename) fwrite(m_triangleTable, sizeof(ModelTriangle), m_triangleUsed, file);
fclose(file);
- return TRUE;
+ return true;
}
// Creates the object in the 3D engine.
-BOOL CModFile::CreateEngineObject(int objRank, int addState)
+bool CModFile::CreateEngineObject(int objRank, int addState)
{
#if 0
char texName2[20];
@@ -556,9 +556,9 @@ BOOL CModFile::CreateEngineObject(int objRank, int addState) state+addState,
m_triangleTable[i].texName, texName2,
m_triangleTable[i].min,
- m_triangleTable[i].max, FALSE);
+ m_triangleTable[i].max, false);
}
- return TRUE;
+ return true;
#else
char texName1[20];
char texName2[20];
@@ -604,9 +604,9 @@ BOOL CModFile::CreateEngineObject(int objRank, int addState) state+addState,
texName1, texName2,
m_triangleTable[i].min,
- m_triangleTable[i].max, FALSE);
+ m_triangleTable[i].max, false);
}
- return TRUE;
+ return true;
#endif
}
diff --git a/src/common/modfile.h b/src/common/modfile.h index 8c11101..c6fc43b 100644 --- a/src/common/modfile.h +++ b/src/common/modfile.h @@ -29,8 +29,8 @@ class CInstanceManager; typedef struct
{
- char bUsed; // TRUE -> using
- char bSelect; // TRUE -> selected
+ char bUsed; // true -> using
+ char bSelect; // true -> selected
D3DVERTEX p1;
D3DVERTEX p2;
D3DVERTEX p3;
@@ -43,8 +43,8 @@ OldModelTriangle1; // length = 196 bytes typedef struct
{
- char bUsed; // TRUE -> used
- char bSelect; // TRUE -> selected
+ char bUsed; // true -> used
+ char bSelect; // true -> selected
D3DVERTEX p1;
D3DVERTEX p2;
D3DVERTEX p3;
@@ -62,8 +62,8 @@ OldModelTriangle2; typedef struct
{
- char bUsed; // TRUE -> used
- char bSelect; // TRUE -> selected
+ char bUsed; // true -> used
+ char bSelect; // true -> selected
D3DVERTEX2 p1;
D3DVERTEX2 p2;
D3DVERTEX2 p3;
@@ -88,12 +88,12 @@ public: CModFile(CInstanceManager* iMan);
~CModFile();
- BOOL ReadDXF(char *filename, float min, float max);
- BOOL AddModel(char *filename, int first, BOOL bEdit=FALSE, BOOL bMeta=TRUE);
- BOOL ReadModel(char *filename, BOOL bEdit=FALSE, BOOL bMeta=TRUE);
- BOOL WriteModel(char *filename);
+ bool ReadDXF(char *filename, float min, float max);
+ bool AddModel(char *filename, int first, bool bEdit=false, bool bMeta=true);
+ bool ReadModel(char *filename, bool bEdit=false, bool bMeta=true);
+ bool WriteModel(char *filename);
- BOOL CreateEngineObject(int objRank, int addState=0);
+ bool CreateEngineObject(int objRank, int addState=0);
void Mirror();
void SetTriangleUsed(int total);
@@ -104,7 +104,7 @@ public: float RetHeight(D3DVECTOR pos);
protected:
- BOOL CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3, float min, float max);
+ bool CreateTriangle(D3DVECTOR p1, D3DVECTOR p2, D3DVECTOR p3, float min, float max);
protected:
CInstanceManager* m_iMan;
diff --git a/src/common/profile.cpp b/src/common/profile.cpp index 864cc22..ab7904b 100644 --- a/src/common/profile.cpp +++ b/src/common/profile.cpp @@ -33,24 +33,24 @@ static char g_filename[100]; -BOOL InitCurrentDirectory()
+bool InitCurrentDirectory()
{
#if _SCHOOL
_fullpath(g_filename, "ceebot.ini", 100);
#else
_fullpath(g_filename, "colobot.ini", 100);
#endif
- return TRUE;
+ return true;
}
-BOOL SetProfileString(char* section, char* key, char* string)
+bool SetProfileString(char* section, char* key, char* string)
{
WritePrivateProfileString(section, key, string, g_filename);
- return TRUE;
+ return true;
}
-BOOL GetProfileString(char* section, char* key, char* buffer, int max)
+bool GetProfileString(char* section, char* key, char* buffer, int max)
{
int nb;
@@ -58,22 +58,22 @@ BOOL GetProfileString(char* section, char* key, char* buffer, int max) if ( nb == 0 )
{
buffer[0] = 0;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
-BOOL SetProfileInt(char* section, char* key, int value)
+bool SetProfileInt(char* section, char* key, int value)
{
char s[20];
sprintf(s, "%d", value);
WritePrivateProfileString(section, key, s, g_filename);
- return TRUE;
+ return true;
}
-BOOL GetProfileInt(char* section, char* key, int &value)
+bool GetProfileInt(char* section, char* key, int &value)
{
char s[20];
int nb;
@@ -82,23 +82,23 @@ BOOL GetProfileInt(char* section, char* key, int &value) if ( nb == 0 )
{
value = 0;
- return FALSE;
+ return false;
}
sscanf(s, "%d", &value);
- return TRUE;
+ return true;
}
-BOOL SetProfileFloat(char* section, char* key, float value)
+bool SetProfileFloat(char* section, char* key, float value)
{
char s[20];
sprintf(s, "%.2f", value);
WritePrivateProfileString(section, key, s, g_filename);
- return TRUE;
+ return true;
}
-BOOL GetProfileFloat(char* section, char* key, float &value)
+bool GetProfileFloat(char* section, char* key, float &value)
{
char s[20];
int nb;
@@ -107,10 +107,10 @@ BOOL GetProfileFloat(char* section, char* key, float &value) if ( nb == 0 )
{
value = 0.0f;
- return FALSE;
+ return false;
}
sscanf(s, "%f", &value);
- return TRUE;
+ return true;
}
diff --git a/src/common/profile.h b/src/common/profile.h index aaf25a7..3a2d870 100644 --- a/src/common/profile.h +++ b/src/common/profile.h @@ -23,12 +23,12 @@ #define D3D_OVERLOADS
-extern BOOL InitCurrentDirectory();
-extern BOOL SetProfileString(char* section, char* key, char* string);
-extern BOOL GetProfileString(char* section, char* key, char* buffer, int max);
-extern BOOL SetProfileInt(char* section, char* key, int value);
-extern BOOL GetProfileInt(char* section, char* key, int &value);
-extern BOOL SetProfileFloat(char* section, char* key, float value);
-extern BOOL GetProfileFloat(char* section, char* key, float &value);
+extern bool InitCurrentDirectory();
+extern bool SetProfileString(char* section, char* key, char* string);
+extern bool GetProfileString(char* section, char* key, char* buffer, int max);
+extern bool SetProfileInt(char* section, char* key, int value);
+extern bool GetProfileInt(char* section, char* key, int &value);
+extern bool SetProfileFloat(char* section, char* key, float value);
+extern bool GetProfileFloat(char* section, char* key, float &value);
diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 42fd438..34c91f2 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -84,7 +84,7 @@ static KeyDesc keyTable[22] = // Seeks a key.
-BOOL SearchKey(char *cmd, KeyRank &key)
+bool SearchKey(char *cmd, KeyRank &key)
{
int i;
@@ -93,10 +93,10 @@ BOOL SearchKey(char *cmd, KeyRank &key) if ( strstr(cmd, keyTable[i].name) == cmd )
{
key = keyTable[i].key;
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
// Replaces the commands "\key name;" in a text.
@@ -143,24 +143,24 @@ void PutKeyName(char* dst, char* src) // Returns the text of a resource.
-BOOL GetResource(ResType type, int num, char* text)
+bool GetResource(ResType type, int num, char* text)
{
char buffer[100];
if ( !GetResourceBase(type, num, buffer) )
{
text[0] = 0;
- return FALSE;
+ return false;
}
PutKeyName(text, buffer);
- return TRUE;
+ return true;
}
// Returns the text of a resource.
-BOOL GetResourceBase(ResType type, int num, char* text)
+bool GetResourceBase(ResType type, int num, char* text)
{
text[0] = 0;
diff --git a/src/common/restext.h b/src/common/restext.h index 3e57d20..2bcbb3d 100644 --- a/src/common/restext.h +++ b/src/common/restext.h @@ -149,9 +149,9 @@ static char g_gamerName[100]; extern void SetEngine(CD3DEngine *engine);
extern void SetGlobalGamerName(char *name);
-extern BOOL SearchKey(char *cmd, KeyRank &key);
+extern bool SearchKey(char *cmd, KeyRank &key);
extern void PutKeyName(char* dst, char* src);
-extern BOOL GetResource(ResType type, int num, char* text);
-extern BOOL GetResourceBase(ResType type, int num, char* text);
+extern bool GetResource(ResType type, int num, char* text);
+extern bool GetResourceBase(ResType type, int num, char* text);
diff --git a/src/graphics/common/blitz.cpp b/src/graphics/common/blitz.cpp index 0447f53..43f4fed 100644 --- a/src/graphics/common/blitz.cpp +++ b/src/graphics/common/blitz.cpp @@ -67,7 +67,7 @@ void CBlitz::Flush() {
int i;
- m_bBlitzExist = FALSE;
+ m_bBlitzExist = false;
m_time = 0.0f;
m_phase = BPH_WAIT;
m_speed = 0.0f;
@@ -83,18 +83,18 @@ void CBlitz::Flush() // Management of an event
-BOOL CBlitz::EventProcess(const Event &event)
+bool CBlitz::EventProcess(const Event &event)
{
if ( event.event == EVENT_FRAME )
{
return EventFrame(event);
}
- return TRUE;
+ return true;
}
// Evolved lightning.
-BOOL CBlitz::EventFrame(const Event &event)
+bool CBlitz::EventFrame(const Event &event)
{
CObject* pObj;
CAutoPara* automat;
@@ -103,8 +103,8 @@ BOOL CBlitz::EventFrame(const Event &event) float dist, deep, max;
int i;
- if ( m_engine->RetPause() ) return TRUE;
- if ( m_engine->RetMovieLock() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( m_engine->RetMovieLock() ) return true;
m_time += event.rTime;
m_progress += event.rTime*m_speed;
@@ -125,12 +125,12 @@ BOOL CBlitz::EventFrame(const Event &event) pObj = SearchObject(m_pos);
if ( pObj == 0 )
{
- m_terrain->MoveOnFloor(m_pos, TRUE);
+ m_terrain->MoveOnFloor(m_pos, true);
}
else
{
m_pos = pObj->RetPosition(0);
- m_terrain->MoveOnFloor(m_pos, TRUE);
+ m_terrain->MoveOnFloor(m_pos, true);
type = pObj->RetType();
if ( type == OBJECT_BASE )
@@ -203,7 +203,7 @@ BOOL CBlitz::EventFrame(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -223,7 +223,7 @@ void CBlitz::Draw() if ( m_phase != BPH_BLITZ ) return;
device = m_engine->RetD3DDevice();
- device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+ device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
D3DUtil_SetIdentityMatrix(matrix);
device->SetTransform(D3DTRANSFORMSTATE_WORLD, &matrix);
@@ -288,15 +288,15 @@ void CBlitz::Draw() p1 = p2;
}
- device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, TRUE);
+ device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, true);
}
// Triggers lightning.
-BOOL CBlitz::Create(float sleep, float delay, float magnetic)
+bool CBlitz::Create(float sleep, float delay, float magnetic)
{
- m_bBlitzExist = TRUE;
+ m_bBlitzExist = true;
if ( sleep < 1.0f ) sleep = 1.0f;
m_sleep = sleep;
m_delay = delay;
@@ -321,29 +321,29 @@ BOOL CBlitz::Create(float sleep, float delay, float magnetic) m_sound = (CSound*)m_iMan->SearchInstance(CLASS_SOUND);
}
- return FALSE;
+ return false;
}
// Gives the status of lightning.
-BOOL CBlitz::GetStatus(float &sleep, float &delay, float &magnetic, float &progress)
+bool CBlitz::GetStatus(float &sleep, float &delay, float &magnetic, float &progress)
{
- if ( !m_bBlitzExist ) return FALSE;
+ if ( !m_bBlitzExist ) return false;
sleep = m_sleep;
delay = m_delay;
magnetic = m_magnetic;
progress = m_progress;
- return TRUE;
+ return true;
}
// Specifies the status of lightning.
-BOOL CBlitz::SetStatus(float sleep, float delay, float magnetic, float progress)
+bool CBlitz::SetStatus(float sleep, float delay, float magnetic, float progress)
{
- m_bBlitzExist = TRUE;
+ m_bBlitzExist = true;
m_sleep = sleep;
m_delay = delay;
@@ -352,7 +352,7 @@ BOOL CBlitz::SetStatus(float sleep, float delay, float magnetic, float progress) m_phase = BPH_WAIT;
m_speed = 1.0f/m_sleep;
- return TRUE;
+ return true;
}
diff --git a/src/graphics/common/blitz.h b/src/graphics/common/blitz.h index 2f8aee9..59268b5 100644 --- a/src/graphics/common/blitz.h +++ b/src/graphics/common/blitz.h @@ -49,14 +49,14 @@ public: ~CBlitz();
void Flush();
- BOOL EventProcess(const Event &event);
- BOOL Create(float sleep, float delay, float magnetic);
- BOOL GetStatus(float &sleep, float &delay, float &magnetic, float &progress);
- BOOL SetStatus(float sleep, float delay, float magnetic, float progress);
+ bool EventProcess(const Event &event);
+ bool Create(float sleep, float delay, float magnetic);
+ bool GetStatus(float &sleep, float &delay, float &magnetic, float &progress);
+ bool SetStatus(float sleep, float delay, float magnetic, float progress);
void Draw();
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
CObject* SearchObject(D3DVECTOR pos);
protected:
@@ -66,7 +66,7 @@ protected: CCamera* m_camera;
CSound* m_sound;
- BOOL m_bBlitzExist;
+ bool m_bBlitzExist;
float m_sleep;
float m_delay;
float m_magnetic;
diff --git a/src/graphics/common/camera.cpp b/src/graphics/common/camera.cpp index e556c20..f3b7d39 100644 --- a/src/graphics/common/camera.cpp +++ b/src/graphics/common/camera.cpp @@ -64,7 +64,7 @@ CCamera::CCamera(CInstanceManager* iMan) m_normLookat = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_focus = 1.0f;
- m_bRightDown = FALSE;
+ m_bRightDown = false;
m_rightPosInit = FPOINT(0.5f, 0.5f);
m_rightPosCenter = FPOINT(0.5f, 0.5f);
m_rightPosMove = FPOINT(0.5f, 0.5f);
@@ -80,7 +80,7 @@ CCamera::CCamera(CInstanceManager* iMan) m_backMin = 0.0f;
m_addDirectionH = 0.0f;
m_addDirectionV = 0.0f;
- m_bTransparency = FALSE;
+ m_bTransparency = false;
m_fixDist = 0.0f;
m_fixDirectionH = 0.0f;
@@ -122,10 +122,10 @@ CCamera::CCamera(CInstanceManager* iMan) m_scriptEye = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_scriptLookat = D3DVECTOR(0.0f, 0.0f, 0.0f);
- m_bEffect = TRUE;
- m_bCameraScroll = TRUE;
- m_bCameraInvertX = FALSE;
- m_bCameraInvertY = FALSE;
+ m_bEffect = true;
+ m_bCameraScroll = true;
+ m_bCameraInvertX = false;
+ m_bCameraInvertY = false;
}
// Object's constructor.
@@ -135,22 +135,22 @@ CCamera::~CCamera() }
-void CCamera::SetEffect(BOOL bEnable)
+void CCamera::SetEffect(bool bEnable)
{
m_bEffect = bEnable;
}
-void CCamera::SetCameraScroll(BOOL bScroll)
+void CCamera::SetCameraScroll(bool bScroll)
{
m_bCameraScroll = bScroll;
}
-void CCamera::SetCameraInvertX(BOOL bInvert)
+void CCamera::SetCameraInvertX(bool bInvert)
{
m_bCameraInvertX = bInvert;
}
-void CCamera::SetCameraInvertY(BOOL bInvert)
+void CCamera::SetCameraInvertY(bool bInvert)
{
m_bCameraInvertY = bInvert;
}
@@ -174,8 +174,8 @@ void CCamera::Init(D3DVECTOR eye, D3DVECTOR lookat, float delay) m_initDelay = delay;
- eye.y += m_terrain->RetFloorLevel(eye, TRUE);
- lookat.y += m_terrain->RetFloorLevel(lookat, TRUE);
+ eye.y += m_terrain->RetFloorLevel(eye, true);
+ lookat.y += m_terrain->RetFloorLevel(lookat, true);
m_type = CAMERA_FREE;
m_eyePt = eye;
@@ -268,7 +268,7 @@ void CCamera::SetType(CameraType type) SetTransparency(pObj, 0.0f); // opaque object
}
}
- m_bTransparency = FALSE;
+ m_bTransparency = false;
if ( type == CAMERA_INFO ||
type == CAMERA_VISIT ) // xx -> info ?
@@ -513,13 +513,13 @@ void CCamera::RetCamera(D3DVECTOR &eye, D3DVECTOR &lookat) // Specifies a special movement of camera to frame action.
-BOOL CCamera::StartCentering(CObject *object, float angleH, float angleV,
+bool CCamera::StartCentering(CObject *object, float angleH, float angleV,
float dist, float time)
{
- if ( m_type != CAMERA_BACK ) return FALSE;
- if ( object != m_cameraObj ) return FALSE;
+ if ( m_type != CAMERA_BACK ) return false;
+ if ( object != m_cameraObj ) return false;
- if ( m_centeringPhase != CP_NULL ) return FALSE;
+ if ( m_centeringPhase != CP_NULL ) return false;
if ( m_addDirectionH > PI )
{
@@ -535,18 +535,18 @@ BOOL CCamera::StartCentering(CObject *object, float angleH, float angleV, m_centeringTime = time;
m_centeringProgress = 0.0f;
- return TRUE;
+ return true;
}
// Ends a special movement of camera to frame action.
-BOOL CCamera::StopCentering(CObject *object, float time)
+bool CCamera::StopCentering(CObject *object, float time)
{
- if ( m_type != CAMERA_BACK ) return FALSE;
- if ( object != m_cameraObj ) return FALSE;
+ if ( m_type != CAMERA_BACK ) return false;
+ if ( object != m_cameraObj ) return false;
if ( m_centeringPhase != CP_START &&
- m_centeringPhase != CP_WAIT ) return FALSE;
+ m_centeringPhase != CP_WAIT ) return false;
m_centeringPhase = CP_STOP;
@@ -562,7 +562,7 @@ BOOL CCamera::StopCentering(CObject *object, float time) m_centeringTime = time;
m_centeringProgress = 0.0f;
- return TRUE;
+ return true;
}
// Stop framing special in the current position.
@@ -976,17 +976,17 @@ void CCamera::SetViewTime(const D3DVECTOR &vEyePt, // Avoid the obstacles.
-BOOL CCamera::IsCollision(D3DVECTOR &eye, D3DVECTOR lookat)
+bool CCamera::IsCollision(D3DVECTOR &eye, D3DVECTOR lookat)
{
if ( m_type == CAMERA_BACK ) return IsCollisionBack(eye, lookat);
if ( m_type == CAMERA_FIX ) return IsCollisionFix(eye, lookat);
if ( m_type == CAMERA_PLANE ) return IsCollisionFix(eye, lookat);
- return FALSE;
+ return false;
}
// Avoid the obstacles.
-BOOL CCamera::IsCollisionBack(D3DVECTOR &eye, D3DVECTOR lookat)
+bool CCamera::IsCollisionBack(D3DVECTOR &eye, D3DVECTOR lookat)
{
#if 0
CObject *pObj;
@@ -1082,16 +1082,16 @@ BOOL CCamera::IsCollisionBack(D3DVECTOR &eye, D3DVECTOR lookat) {
eye = proj;
eye.y += len/5.0f;
- return FALSE;
+ return false;
}
else
{
eye = (eye-lookat)*prox/del + lookat;
eye.y += (del-prox)/5.0f;
- return FALSE;
+ return false;
}
}
- return FALSE;
+ return false;
#else
CObject *pObj;
D3DVECTOR oPos, min, max, proj;
@@ -1116,7 +1116,7 @@ BOOL CCamera::IsCollisionBack(D3DVECTOR &eye, D3DVECTOR lookat) max.y = Max(m_actualEye.y, m_actualLookat.y);
max.z = Max(m_actualEye.z, m_actualLookat.z);
- m_bTransparency = FALSE;
+ m_bTransparency = false;
for ( i=0 ; i<1000000 ; i++ )
{
@@ -1188,15 +1188,15 @@ BOOL CCamera::IsCollisionBack(D3DVECTOR &eye, D3DVECTOR lookat) if ( len > del ) continue;
SetTransparency(pObj, 1.0f); // transparent object
- m_bTransparency = TRUE;
+ m_bTransparency = true;
}
- return FALSE;
+ return false;
#endif
}
// Avoid the obstacles.
-BOOL CCamera::IsCollisionFix(D3DVECTOR &eye, D3DVECTOR lookat)
+bool CCamera::IsCollisionFix(D3DVECTOR &eye, D3DVECTOR lookat)
{
CObject *pObj;
D3DVECTOR oPos, proj;
@@ -1239,16 +1239,16 @@ BOOL CCamera::IsCollisionFix(D3DVECTOR &eye, D3DVECTOR lookat) dist = Length(eye, lookat);
proj = Projection(eye, lookat, oPos);
eye = (lookat-eye)*oRadius/dist + proj;
- return FALSE;
+ return false;
}
}
- return FALSE;
+ return false;
}
// Management of an event.
-BOOL CCamera::EventProcess(const Event &event)
+bool CCamera::EventProcess(const Event &event)
{
switch( event.event )
{
@@ -1258,17 +1258,17 @@ BOOL CCamera::EventProcess(const Event &event) #if 0
case EVENT_RBUTTONDOWN:
- m_bRightDown = TRUE;
+ m_bRightDown = true;
m_rightPosInit = event.pos;
m_rightPosCenter = FPOINT(0.5f, 0.5f);
m_engine->MoveMousePos(m_rightPosCenter);
-//? m_engine->SetMouseHide(TRUE); // cache la souris
+//? m_engine->SetMouseHide(true); // cache la souris
break;
case EVENT_RBUTTONUP:
- m_bRightDown = FALSE;
+ m_bRightDown = false;
m_engine->MoveMousePos(m_rightPosInit);
-//? m_engine->SetMouseHide(FALSE); // remontre la souris
+//? m_engine->SetMouseHide(false); // remontre la souris
m_addDirectionH = 0.0f;
m_addDirectionV = -PI*0.05f;
break;
@@ -1283,15 +1283,15 @@ BOOL CCamera::EventProcess(const Event &event) if ( event.param == VK_WHEELDOWN ) EventMouseWheel(-1);
break;
}
- return TRUE;
+ return true;
}
// Changed the camera according to the mouse moved.
-BOOL CCamera::EventMouseMove(const Event &event)
+bool CCamera::EventMouseMove(const Event &event)
{
m_mousePos = event.pos;
- return TRUE;
+ return true;
}
// Mouse wheel operated.
@@ -1344,7 +1344,7 @@ void CCamera::EventMouseWheel(int dir) // Changed the camera according to the time elapsed.
-BOOL CCamera::EventFrame(const Event &event)
+bool CCamera::EventFrame(const Event &event)
{
EffectFrame(event);
OverFrame(event);
@@ -1391,7 +1391,7 @@ BOOL CCamera::EventFrame(const Event &event) return EventFrameVisit(event);
}
- return TRUE;
+ return true;
}
@@ -1482,7 +1482,7 @@ D3DMouse CCamera::RetMouseDef(FPOINT pos) // Moves the point of view.
-BOOL CCamera::EventFrameFree(const Event &event)
+bool CCamera::EventFrameFree(const Event &event)
{
D3DVECTOR pos, vLookatPt;
float factor;
@@ -1536,12 +1536,12 @@ BOOL CCamera::EventFrameFree(const Event &event) m_terrain->ValidPosition(m_eyePt, 10.0f);
- if ( m_terrain->MoveOnFloor(m_eyePt, TRUE) )
+ if ( m_terrain->MoveOnFloor(m_eyePt, true) )
{
m_eyePt.y += m_heightEye;
pos = m_eyePt;
- if ( m_terrain->MoveOnFloor(pos, TRUE) )
+ if ( m_terrain->MoveOnFloor(pos, true) )
{
pos.y -= 2.0f;
if ( m_eyePt.y < pos.y )
@@ -1554,19 +1554,19 @@ BOOL CCamera::EventFrameFree(const Event &event) vLookatPt = LookatPoint( m_eyePt, m_directionH, m_directionV, 50.0f );
- if ( m_terrain->MoveOnFloor(vLookatPt, TRUE) )
+ if ( m_terrain->MoveOnFloor(vLookatPt, true) )
{
vLookatPt.y += m_heightLookat;
}
SetViewTime(m_eyePt, vLookatPt, event.rTime);
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameEdit(const Event &event)
+bool CCamera::EventFrameEdit(const Event &event)
{
D3DVECTOR pos, vLookatPt;
float factor;
@@ -1596,12 +1596,12 @@ BOOL CCamera::EventFrameEdit(const Event &event) m_terrain->ValidPosition(m_eyePt, 10.0f);
- if ( m_terrain->MoveOnFloor(m_eyePt, FALSE) )
+ if ( m_terrain->MoveOnFloor(m_eyePt, false) )
{
m_eyePt.y += m_editHeight;
pos = m_eyePt;
- if ( m_terrain->MoveOnFloor(pos, FALSE) )
+ if ( m_terrain->MoveOnFloor(pos, false) )
{
pos.y += 2.0f;
if ( m_eyePt.y < pos.y )
@@ -1614,26 +1614,26 @@ BOOL CCamera::EventFrameEdit(const Event &event) vLookatPt = LookatPoint( m_eyePt, m_directionH, m_directionV, 50.0f );
- if ( m_terrain->MoveOnFloor(vLookatPt, TRUE) )
+ if ( m_terrain->MoveOnFloor(vLookatPt, true) )
{
vLookatPt.y += m_heightLookat;
}
SetViewTime(m_eyePt, vLookatPt, event.rTime);
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameDialog(const Event &event)
+bool CCamera::EventFrameDialog(const Event &event)
{
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameBack(const Event &event)
+bool CCamera::EventFrameBack(const Event &event)
{
CPhysics* physics;
ObjectType type;
@@ -1831,12 +1831,12 @@ BOOL CCamera::EventFrameBack(const Event &event) m_directionV = v;
}
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameFix(const Event &event)
+bool CCamera::EventFrameFix(const Event &event)
{
D3DVECTOR pos, vLookatPt;
float h, v, d;
@@ -1891,12 +1891,12 @@ BOOL CCamera::EventFrameFix(const Event &event) m_directionV = v;
}
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameExplo(const Event &event)
+bool CCamera::EventFrameExplo(const Event &event)
{
D3DVECTOR pos, vLookatPt;
float factor;
@@ -1910,12 +1910,12 @@ BOOL CCamera::EventFrameExplo(const Event &event) m_terrain->ValidPosition(m_eyePt, 10.0f);
- if ( m_terrain->MoveOnFloor(m_eyePt, FALSE) )
+ if ( m_terrain->MoveOnFloor(m_eyePt, false) )
{
m_eyePt.y += m_heightEye;
pos = m_eyePt;
- if ( m_terrain->MoveOnFloor(pos, FALSE) )
+ if ( m_terrain->MoveOnFloor(pos, false) )
{
pos.y += 2.0f;
if ( m_eyePt.y < pos.y )
@@ -1928,19 +1928,19 @@ BOOL CCamera::EventFrameExplo(const Event &event) vLookatPt = LookatPoint( m_eyePt, m_directionH, m_directionV, 50.0f );
- if ( m_terrain->MoveOnFloor(vLookatPt, TRUE) )
+ if ( m_terrain->MoveOnFloor(vLookatPt, true) )
{
vLookatPt.y += m_heightLookat;
}
SetViewTime(m_eyePt, vLookatPt, event.rTime);
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameOnBoard(const Event &event)
+bool CCamera::EventFrameOnBoard(const Event &event)
{
D3DVECTOR vLookatPt, vUpVec, eye, lookat, pos;
@@ -1955,22 +1955,22 @@ BOOL CCamera::EventFrameOnBoard(const Event &event) m_actualEye = eye;
m_actualLookat = lookat;
}
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameInfo(const Event &event)
+bool CCamera::EventFrameInfo(const Event &event)
{
SetViewTime(D3DVECTOR(0.0f, 0.0f, 0.0f),
D3DVECTOR(0.0f, 0.0f, 1.0f),
event.rTime);
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameVisit(const Event &event)
+bool CCamera::EventFrameVisit(const Event &event)
{
D3DVECTOR eye;
float angleH, angleV;
@@ -2015,16 +2015,16 @@ BOOL CCamera::EventFrameVisit(const Event &event) eye = ExcludeObject(eye, m_visitGoal, angleH, angleV);
SetViewTime(eye, m_visitGoal, event.rTime);
- return TRUE;
+ return true;
}
// Moves the point of view.
-BOOL CCamera::EventFrameScript(const Event &event)
+bool CCamera::EventFrameScript(const Event &event)
{
SetViewTime(m_scriptEye+m_effectOffset,
m_scriptLookat+m_effectOffset, event.rTime);
- return TRUE;
+ return true;
}
void CCamera::SetScriptEye(D3DVECTOR eye)
@@ -2043,12 +2043,12 @@ void CCamera::SetScriptLookat(D3DVECTOR lookat) void CCamera::SetViewParams(const D3DVECTOR &eye, const D3DVECTOR &lookat,
const D3DVECTOR &up)
{
- BOOL bUnder;
+ bool bUnder;
m_engine->SetViewParams(eye, lookat, up, m_eyeDistance);
bUnder = (eye.y < m_water->RetLevel()); // Is it underwater?
- if ( m_type == CAMERA_INFO ) bUnder = FALSE;
+ if ( m_type == CAMERA_INFO ) bUnder = false;
m_engine->SetRankView(bUnder?1:0);
}
diff --git a/src/graphics/common/camera.h b/src/graphics/common/camera.h index 7723dfc..407d522 100644 --- a/src/graphics/common/camera.h +++ b/src/graphics/common/camera.h @@ -91,7 +91,7 @@ public: CCamera(CInstanceManager* iMan);
~CCamera();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Init(D3DVECTOR eye, D3DVECTOR lookat, float delay);
@@ -121,8 +121,8 @@ public: void RetCamera(D3DVECTOR &eye, D3DVECTOR &lookat);
- BOOL StartCentering(CObject *object, float angleH, float angleV, float dist, float time);
- BOOL StopCentering(CObject *object, float time);
+ bool StartCentering(CObject *object, float angleH, float angleV, float dist, float time);
+ bool StopCentering(CObject *object, float time);
void AbortCentering();
void FlushEffect();
@@ -136,33 +136,33 @@ public: void SetScriptEye(D3DVECTOR eye);
void SetScriptLookat(D3DVECTOR lookat);
- void SetEffect(BOOL bEnable);
- void SetCameraScroll(BOOL bScroll);
- void SetCameraInvertX(BOOL bInvert);
- void SetCameraInvertY(BOOL bInvert);
+ void SetEffect(bool bEnable);
+ void SetCameraScroll(bool bScroll);
+ void SetCameraInvertX(bool bInvert);
+ void SetCameraInvertY(bool bInvert);
float RetMotorTurn();
D3DMouse RetMouseDef(FPOINT pos);
protected:
- BOOL EventMouseMove(const Event &event);
+ bool EventMouseMove(const Event &event);
void EventMouseWheel(int dir);
- BOOL EventFrame(const Event &event);
- BOOL EventFrameFree(const Event &event);
- BOOL EventFrameEdit(const Event &event);
- BOOL EventFrameDialog(const Event &event);
- BOOL EventFrameBack(const Event &event);
- BOOL EventFrameFix(const Event &event);
- BOOL EventFrameExplo(const Event &event);
- BOOL EventFrameOnBoard(const Event &event);
- BOOL EventFrameInfo(const Event &event);
- BOOL EventFrameVisit(const Event &event);
- BOOL EventFrameScript(const Event &event);
+ bool EventFrame(const Event &event);
+ bool EventFrameFree(const Event &event);
+ bool EventFrameEdit(const Event &event);
+ bool EventFrameDialog(const Event &event);
+ bool EventFrameBack(const Event &event);
+ bool EventFrameFix(const Event &event);
+ bool EventFrameExplo(const Event &event);
+ bool EventFrameOnBoard(const Event &event);
+ bool EventFrameInfo(const Event &event);
+ bool EventFrameVisit(const Event &event);
+ bool EventFrameScript(const Event &event);
void SetViewTime(const D3DVECTOR &vEyePt, const D3DVECTOR &vLookatPt, float rTime);
- BOOL IsCollision(D3DVECTOR &eye, D3DVECTOR lookat);
- BOOL IsCollisionBack(D3DVECTOR &eye, D3DVECTOR lookat);
- BOOL IsCollisionFix(D3DVECTOR &eye, D3DVECTOR lookat);
+ bool IsCollision(D3DVECTOR &eye, D3DVECTOR lookat);
+ bool IsCollisionBack(D3DVECTOR &eye, D3DVECTOR lookat);
+ bool IsCollisionFix(D3DVECTOR &eye, D3DVECTOR lookat);
D3DVECTOR ExcludeTerrain(D3DVECTOR eye, D3DVECTOR lookat, float &angleH, float &angleV);
D3DVECTOR ExcludeObject(D3DVECTOR eye, D3DVECTOR lookat, float &angleH, float &angleV);
@@ -192,7 +192,7 @@ protected: D3DVECTOR m_normLookat; // aim normal
float m_focus;
- BOOL m_bRightDown;
+ bool m_bRightDown;
FPOINT m_rightPosInit;
FPOINT m_rightPosCenter;
FPOINT m_rightPosMove;
@@ -208,7 +208,7 @@ protected: float m_backMin; // CAMERA_BACK: distance minimal
float m_addDirectionH; // CAMERA_BACK: additional direction
float m_addDirectionV; // CAMERA_BACK: additional direction
- BOOL m_bTransparency;
+ bool m_bTransparency;
float m_fixDist; // CAMERA_FIX: distance
float m_fixDirectionH; // CAMERA_FIX: direction
@@ -260,9 +260,9 @@ protected: D3DVECTOR m_scriptEye;
D3DVECTOR m_scriptLookat;
- BOOL m_bEffect; // shocks if explosion?
- BOOL m_bCameraScroll; // scroll in the edges?
- BOOL m_bCameraInvertX; // X inversion in the edges?
- BOOL m_bCameraInvertY; // Y inversion in the edges?
+ bool m_bEffect; // shocks if explosion?
+ bool m_bCameraScroll; // scroll in the edges?
+ bool m_bCameraInvertX; // X inversion in the edges?
+ bool m_bCameraInvertY; // Y inversion in the edges?
};
diff --git a/src/graphics/common/cloud.cpp b/src/graphics/common/cloud.cpp index 0892962..75e44d6 100644 --- a/src/graphics/common/cloud.cpp +++ b/src/graphics/common/cloud.cpp @@ -53,7 +53,7 @@ CCloud::CCloud(CInstanceManager* iMan, CD3DEngine* engine) m_wind = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_subdiv = 8;
m_filename[0] = 0;
- m_bEnable = TRUE;
+ m_bEnable = true;
}
// Destructor of clouds.
@@ -63,30 +63,30 @@ CCloud::~CCloud() }
-BOOL CCloud::EventProcess(const Event &event)
+bool CCloud::EventProcess(const Event &event)
{
if ( event.event == EVENT_FRAME )
{
return EventFrame(event);
}
- return TRUE;
+ return true;
}
// Makes the clouds evolve.
-BOOL CCloud::EventFrame(const Event &event)
+bool CCloud::EventFrame(const Event &event)
{
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
m_time += event.rTime;
- if ( m_level == 0.0f ) return TRUE;
+ if ( m_level == 0.0f ) return true;
- if ( m_time-m_lastTest < 0.2f ) return TRUE;
+ if ( m_time-m_lastTest < 0.2f ) return true;
m_lastTest = m_time;
- return TRUE;
+ return true;
}
@@ -149,10 +149,10 @@ void CCloud::Draw() device = m_engine->RetD3DDevice();
device->SetRenderState(D3DRENDERSTATE_AMBIENT, 0x00000000);
- device->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE);
- device->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE);
-//? device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, TRUE);
- device->SetRenderState(D3DRENDERSTATE_FOGENABLE, TRUE);
+ device->SetRenderState(D3DRENDERSTATE_LIGHTING, false);
+ device->SetRenderState(D3DRENDERSTATE_ZENABLE, false);
+//? device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, true);
+ device->SetRenderState(D3DRENDERSTATE_FOGENABLE, true);
device->SetRenderState(D3DRENDERSTATE_FOGSTART, F2DW(fogStart));
device->SetRenderState(D3DRENDERSTATE_FOGEND, F2DW(fogEnd));
@@ -229,7 +229,7 @@ void CCloud::Draw() // Updates the positions, relative to the ground.
-BOOL CCloud::CreateLine(int x, int y, int len)
+bool CCloud::CreateLine(int x, int y, int len)
{
float offset;
@@ -250,7 +250,7 @@ BOOL CCloud::CreateLine(int x, int y, int len) // Creates all areas of cloud.
-BOOL CCloud::Create(const char *filename,
+bool CCloud::Create(const char *filename,
D3DCOLORVALUE diffuse, D3DCOLORVALUE ambient,
float level)
{
@@ -282,14 +282,14 @@ BOOL CCloud::Create(const char *filename, m_brick /= m_subdiv*DIMEXPAND;
m_size *= m_subdiv*DIMEXPAND;
- if ( m_level == 0.0f ) return TRUE;
+ if ( m_level == 0.0f ) return true;
m_lineUsed = 0;
for ( y=0 ; y<m_brick ; y++ )
{
CreateLine(0, y, m_brick);
}
- return TRUE;
+ return true;
}
// Removes all the clouds.
@@ -302,7 +302,7 @@ void CCloud::Flush() // Modifies the cloud level.
-BOOL CCloud::SetLevel(float level)
+bool CCloud::SetLevel(float level)
{
m_level = level;
@@ -320,12 +320,12 @@ float CCloud::RetLevel() // Activate management of clouds.
-void CCloud::SetEnable(BOOL bEnable)
+void CCloud::SetEnable(bool bEnable)
{
m_bEnable = bEnable;
}
-BOOL CCloud::RetEnable()
+bool CCloud::RetEnable()
{
return m_bEnable;
}
diff --git a/src/graphics/common/cloud.h b/src/graphics/common/cloud.h index d0dcb97..2be63c7 100644 --- a/src/graphics/common/cloud.h +++ b/src/graphics/common/cloud.h @@ -45,21 +45,21 @@ public: CCloud(CInstanceManager* iMan, CD3DEngine* engine);
~CCloud();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Flush();
- BOOL Create(const char *filename, D3DCOLORVALUE diffuse, D3DCOLORVALUE ambient, float level);
+ bool Create(const char *filename, D3DCOLORVALUE diffuse, D3DCOLORVALUE ambient, float level);
void Draw();
- BOOL SetLevel(float level);
+ bool SetLevel(float level);
float RetLevel();
- void SetEnable(BOOL bEnable);
- BOOL RetEnable();
+ void SetEnable(bool bEnable);
+ bool RetEnable();
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
void AdjustLevel(D3DVECTOR &pos, D3DVECTOR &eye, float deep, FPOINT &uv1, FPOINT &uv2);
- BOOL CreateLine(int x, int y, int len);
+ bool CreateLine(int x, int y, int len);
protected:
CInstanceManager* m_iMan;
@@ -82,6 +82,6 @@ protected: int m_lineUsed;
CloudLine m_line[MAXCLOUDLINE];
- BOOL m_bEnable;
+ bool m_bEnable;
};
diff --git a/src/graphics/common/light.cpp b/src/graphics/common/light.cpp index 0beeb50..29cd1d6 100644 --- a/src/graphics/common/light.cpp +++ b/src/graphics/common/light.cpp @@ -123,8 +123,8 @@ void CLight::FlushLight() for ( i=0 ; i<D3DMAXLIGHT ; i++ )
{
- m_lightTable[i].bUsed = FALSE;
- m_pD3DDevice->LightEnable(i, FALSE);
+ m_lightTable[i].bUsed = false;
+ m_pD3DDevice->LightEnable(i, false);
}
m_lightUsed = 0;
}
@@ -138,11 +138,11 @@ int CLight::CreateLight() for ( i=0 ; i<D3DMAXLIGHT ; i++ )
{
- if ( m_lightTable[i].bUsed == FALSE )
+ if ( m_lightTable[i].bUsed == false )
{
ZeroMemory(&m_lightTable[i], sizeof(Light));
- m_lightTable[i].bUsed = TRUE;
- m_lightTable[i].bEnable = TRUE;
+ m_lightTable[i].bUsed = true;
+ m_lightTable[i].bEnable = true;
m_lightTable[i].incluType = TYPENULL;
m_lightTable[i].excluType = TYPENULL;
@@ -175,33 +175,33 @@ int CLight::CreateLight() // Deletes a light.
-BOOL CLight::DeleteLight(int lightRank)
+bool CLight::DeleteLight(int lightRank)
{
int i;
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
- m_lightTable[lightRank].bUsed = FALSE;
- m_pD3DDevice->LightEnable(lightRank, FALSE);
+ m_lightTable[lightRank].bUsed = false;
+ m_pD3DDevice->LightEnable(lightRank, false);
m_lightUsed = 0;
for ( i=0 ; i<D3DMAXLIGHT ; i++ )
{
- if ( m_lightTable[i].bUsed == TRUE )
+ if ( m_lightTable[i].bUsed == true )
{
m_lightUsed = i+1;
}
}
- return TRUE;
+ return true;
}
// Specifies a light.
-BOOL CLight::SetLight(int lightRank, const D3DLIGHT7 &light)
+bool CLight::SetLight(int lightRank, const D3DLIGHT7 &light)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
m_lightTable[lightRank].light = light;
@@ -209,62 +209,62 @@ BOOL CLight::SetLight(int lightRank, const D3DLIGHT7 &light) ProgInit(m_lightTable[lightRank].colorGreen, m_lightTable[lightRank].light.dcvDiffuse.g);
ProgInit(m_lightTable[lightRank].colorBlue, m_lightTable[lightRank].light.dcvDiffuse.b);
- return TRUE;
+ return true;
}
// Gives the specifications of a light.
-BOOL CLight::GetLight(int lightRank, D3DLIGHT7 &light)
+bool CLight::GetLight(int lightRank, D3DLIGHT7 &light)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
light = m_lightTable[lightRank].light;
- return TRUE;
+ return true;
}
// Lights up or put out a light.
-BOOL CLight::LightEnable(int lightRank, BOOL bEnable)
+bool CLight::LightEnable(int lightRank, bool bEnable)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
m_lightTable[lightRank].bEnable = bEnable;
- return TRUE;
+ return true;
}
// Specifies the type (TYPE *) items included in this light.
// This light does not light up so that this type of objects.
-BOOL CLight::SetLightIncluType(int lightRank, D3DTypeObj type)
+bool CLight::SetLightIncluType(int lightRank, D3DTypeObj type)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
m_lightTable[lightRank].incluType = type;
- return TRUE;
+ return true;
}
// Specifies the type (TYPE *) items excluded by this light.
// This light does not illuminate then ever these objects.
-BOOL CLight::SetLightExcluType(int lightRank, D3DTypeObj type)
+bool CLight::SetLightExcluType(int lightRank, D3DTypeObj type)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
m_lightTable[lightRank].excluType = type;
- return TRUE;
+ return true;
}
// Management of the position of the light.
-BOOL CLight::SetLightPos(int lightRank, D3DVECTOR pos)
+bool CLight::SetLightPos(int lightRank, D3DVECTOR pos)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
m_lightTable[lightRank].light.dvPosition = pos;
- return TRUE;
+ return true;
}
D3DVECTOR CLight::RetLightPos(int lightRank)
@@ -277,12 +277,12 @@ D3DVECTOR CLight::RetLightPos(int lightRank) // Management direction of the light.
-BOOL CLight::SetLightDir(int lightRank, D3DVECTOR dir)
+bool CLight::SetLightDir(int lightRank, D3DVECTOR dir)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
m_lightTable[lightRank].light.dvDirection = dir;
- return TRUE;
+ return true;
}
D3DVECTOR CLight::RetLightDir(int lightRank)
@@ -295,22 +295,22 @@ D3DVECTOR CLight::RetLightDir(int lightRank) // Specifies the rate of change.
-BOOL CLight::SetLightIntensitySpeed(int lightRank, float speed)
+bool CLight::SetLightIntensitySpeed(int lightRank, float speed)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
m_lightTable[lightRank].intensity.speed = speed;
- return TRUE;
+ return true;
}
// Management of the intensity of light.
-BOOL CLight::SetLightIntensity(int lightRank, float value)
+bool CLight::SetLightIntensity(int lightRank, float value)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
ProgSet(m_lightTable[lightRank].intensity, value);
- return TRUE;
+ return true;
}
float CLight::RetLightIntensity(int lightRank)
@@ -323,26 +323,26 @@ float CLight::RetLightIntensity(int lightRank) // Specifies the rate of change.
-BOOL CLight::SetLightColorSpeed(int lightRank, float speed)
+bool CLight::SetLightColorSpeed(int lightRank, float speed)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
m_lightTable[lightRank].colorRed.speed = speed;
m_lightTable[lightRank].colorGreen.speed = speed;
m_lightTable[lightRank].colorBlue.speed = speed;
- return TRUE;
+ return true;
}
// Color management for light.
-BOOL CLight::SetLightColor(int lightRank, D3DCOLORVALUE color)
+bool CLight::SetLightColor(int lightRank, D3DCOLORVALUE color)
{
- if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return FALSE;
+ if ( lightRank < 0 || lightRank >= D3DMAXLIGHT ) return false;
ProgSet(m_lightTable[lightRank].colorRed, color.r);
ProgSet(m_lightTable[lightRank].colorGreen, color.g);
ProgSet(m_lightTable[lightRank].colorBlue, color.b);
- return TRUE;
+ return true;
}
D3DCOLORVALUE CLight::RetLightColor(int lightRank)
@@ -374,7 +374,7 @@ void CLight::AdaptLightColor(D3DCOLORVALUE color, float factor) for ( i=0 ; i<m_lightUsed ; i++ )
{
- if ( m_lightTable[i].bUsed == FALSE ) continue;
+ if ( m_lightTable[i].bUsed == false ) continue;
value.r = m_lightTable[i].colorRed.current;
value.g = m_lightTable[i].colorGreen.current;
@@ -408,7 +408,7 @@ void CLight::FrameLight(float rTime) for ( i=0 ; i<m_lightUsed ; i++ )
{
- if ( m_lightTable[i].bUsed == FALSE ) continue;
+ if ( m_lightTable[i].bUsed == false ) continue;
ProgFrame(m_lightTable[i].intensity, rTime);
ProgFrame(m_lightTable[i].colorRed, rTime);
@@ -438,16 +438,16 @@ void CLight::FrameLight(float rTime) void CLight::LightUpdate()
{
- BOOL bEnable;
+ bool bEnable;
float value;
int i;
for ( i=0 ; i<m_lightUsed ; i++ )
{
- if ( m_lightTable[i].bUsed == FALSE ) continue;
+ if ( m_lightTable[i].bUsed == false ) continue;
bEnable = m_lightTable[i].bEnable;
- if ( m_lightTable[i].intensity.current == 0.0f ) bEnable = FALSE;
+ if ( m_lightTable[i].intensity.current == 0.0f ) bEnable = false;
if ( bEnable )
{
@@ -478,13 +478,13 @@ void CLight::LightUpdate() void CLight::LightUpdate(D3DTypeObj type)
{
- BOOL bEnable;
+ bool bEnable;
int i;
for ( i=0 ; i<m_lightUsed ; i++ )
{
- if ( m_lightTable[i].bUsed == FALSE ) continue;
- if ( m_lightTable[i].bEnable == FALSE ) continue;
+ if ( m_lightTable[i].bUsed == false ) continue;
+ if ( m_lightTable[i].bEnable == false ) continue;
if ( m_lightTable[i].intensity.current == 0.0f ) continue;
if ( m_lightTable[i].incluType != TYPENULL )
diff --git a/src/graphics/common/light.h b/src/graphics/common/light.h index 52c2a2f..2ae8d2a 100644 --- a/src/graphics/common/light.h +++ b/src/graphics/common/light.h @@ -42,8 +42,8 @@ LightProg; typedef struct
{
- char bUsed; // TRUE -> light exists
- char bEnable; // TRUE -> light turned on
+ char bUsed; // true -> light exists
+ char bEnable; // true -> light turned on
D3DTypeObj incluType; // type of all objects included
D3DTypeObj excluType; // type of all objects excluded
@@ -69,27 +69,27 @@ public: void FlushLight();
int CreateLight();
- BOOL DeleteLight(int lightRank);
- BOOL SetLight(int lightRank, const D3DLIGHT7 &light);
- BOOL GetLight(int lightRank, D3DLIGHT7 &light);
- BOOL LightEnable(int lightRank, BOOL bEnable);
+ bool DeleteLight(int lightRank);
+ bool SetLight(int lightRank, const D3DLIGHT7 &light);
+ bool GetLight(int lightRank, D3DLIGHT7 &light);
+ bool LightEnable(int lightRank, bool bEnable);
- BOOL SetLightIncluType(int lightRank, D3DTypeObj type);
- BOOL SetLightExcluType(int lightRank, D3DTypeObj type);
+ bool SetLightIncluType(int lightRank, D3DTypeObj type);
+ bool SetLightExcluType(int lightRank, D3DTypeObj type);
- BOOL SetLightPos(int lightRank, D3DVECTOR pos);
+ bool SetLightPos(int lightRank, D3DVECTOR pos);
D3DVECTOR RetLightPos(int lightRank);
- BOOL SetLightDir(int lightRank, D3DVECTOR dir);
+ bool SetLightDir(int lightRank, D3DVECTOR dir);
D3DVECTOR RetLightDir(int lightRank);
- BOOL SetLightIntensitySpeed(int lightRank, float speed);
- BOOL SetLightIntensity(int lightRank, float value);
+ bool SetLightIntensitySpeed(int lightRank, float speed);
+ bool SetLightIntensity(int lightRank, float value);
float RetLightIntensity(int lightRank);
void AdaptLightColor(D3DCOLORVALUE color, float factor);
- BOOL SetLightColorSpeed(int lightRank, float speed);
- BOOL SetLightColor(int lightRank, D3DCOLORVALUE color);
+ bool SetLightColorSpeed(int lightRank, float speed);
+ bool SetLightColor(int lightRank, D3DCOLORVALUE color);
D3DCOLORVALUE RetLightColor(int lightRank);
void FrameLight(float rTime);
diff --git a/src/graphics/common/mainmovie.cpp b/src/graphics/common/mainmovie.cpp index 5618406..23c3652 100644 --- a/src/graphics/common/mainmovie.cpp +++ b/src/graphics/common/mainmovie.cpp @@ -75,7 +75,7 @@ void CMainMovie::Flush() // Start of a film.
-BOOL CMainMovie::Start(MainMovieType type, float time)
+bool CMainMovie::Start(MainMovieType type, float time)
{
D3DMATRIX* mat;
D3DVECTOR pos;
@@ -92,7 +92,7 @@ BOOL CMainMovie::Start(MainMovieType type, float time) if ( pObj == 0 )
{
m_type = MM_NONE; // it's over!
- return TRUE;
+ return true;
}
motion = pObj->RetMotion();
@@ -131,12 +131,12 @@ BOOL CMainMovie::Start(MainMovieType type, float time) m_type = MM_NONE; // it's already over!
}
- return TRUE;
+ return true;
}
// Stop a current movie.
-BOOL CMainMovie::Stop()
+bool CMainMovie::Stop()
{
CObject* pObj;
CMotion* motion;
@@ -155,12 +155,12 @@ BOOL CMainMovie::Stop() }
m_type = MM_NONE;
- return TRUE;
+ return true;
}
// Indicates whether a film is in progress.
-BOOL CMainMovie::IsExist()
+bool CMainMovie::IsExist()
{
return (m_type != MM_NONE);
}
@@ -168,12 +168,12 @@ BOOL CMainMovie::IsExist() // Processing an event.
-BOOL CMainMovie::EventProcess(const Event &event)
+bool CMainMovie::EventProcess(const Event &event)
{
D3DVECTOR initialEye, initialLookat, finalEye, finalLookat, eye, lookat;
float progress;
- if ( m_type == MM_NONE ) return TRUE;
+ if ( m_type == MM_NONE ) return true;
m_progress += event.rTime*m_speed;
@@ -211,7 +211,7 @@ BOOL CMainMovie::EventProcess(const Event &event) {
m_stopType = m_type;
Flush();
- return FALSE;
+ return false;
}
}
@@ -224,11 +224,11 @@ BOOL CMainMovie::EventProcess(const Event &event) {
m_stopType = m_type;
Flush();
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
diff --git a/src/graphics/common/mainmovie.h b/src/graphics/common/mainmovie.h index fa65730..f02f0f1 100644 --- a/src/graphics/common/mainmovie.h +++ b/src/graphics/common/mainmovie.h @@ -47,10 +47,10 @@ public: ~CMainMovie();
void Flush();
- BOOL Start(MainMovieType type, float time);
- BOOL Stop();
- BOOL IsExist();
- BOOL EventProcess(const Event &event);
+ bool Start(MainMovieType type, float time);
+ bool Stop();
+ bool IsExist();
+ bool EventProcess(const Event &event);
MainMovieType RetType();
MainMovieType RetStopType();
diff --git a/src/graphics/common/model.cpp b/src/graphics/common/model.cpp index 9fa2b2e..324f219 100644 --- a/src/graphics/common/model.cpp +++ b/src/graphics/common/model.cpp @@ -97,13 +97,13 @@ CModel::CModel(CInstanceManager* iMan) m_state = 0;
m_textureMode = 0;
m_textureRotate = 0;
- m_bTextureMirrorX = FALSE;
- m_bTextureMirrorY = FALSE;
+ m_bTextureMirrorX = false;
+ m_bTextureMirrorY = false;
m_texturePart = 0;
TexturePartUpdate();
- m_bDisplayTransparent = FALSE;
- m_bDisplayOnlySelection = FALSE;
+ m_bDisplayTransparent = false;
+ m_bDisplayOnlySelection = false;
InitView();
m_triangleSel1 = 0;
@@ -404,47 +404,47 @@ void CModel::GetScriptName(char *buffer) // Indicates whether the edition name has focus.
-BOOL CModel::IsEditFocus()
+bool CModel::IsEditFocus()
{
CEdit* pe;
pe = (CEdit*)m_interface->SearchControl(EVENT_EDIT1);
if ( pe != 0 )
{
- if ( pe->RetFocus() ) return TRUE;
+ if ( pe->RetFocus() ) return true;
}
pe = (CEdit*)m_interface->SearchControl(EVENT_EDIT2);
if ( pe != 0 )
{
- if ( pe->RetFocus() ) return TRUE;
+ if ( pe->RetFocus() ) return true;
}
pe = (CEdit*)m_interface->SearchControl(EVENT_EDIT3);
if ( pe != 0 )
{
- if ( pe->RetFocus() ) return TRUE;
+ if ( pe->RetFocus() ) return true;
}
pe = (CEdit*)m_interface->SearchControl(EVENT_EDIT4);
if ( pe != 0 )
{
- if ( pe->RetFocus() ) return TRUE;
+ if ( pe->RetFocus() ) return true;
}
pe = (CEdit*)m_interface->SearchControl(EVENT_EDIT5);
if ( pe != 0 )
{
- if ( pe->RetFocus() ) return TRUE;
+ if ( pe->RetFocus() ) return true;
}
- return FALSE;
+ return false;
}
// Management of an event.
-BOOL CModel::EventProcess(const Event &event)
+bool CModel::EventProcess(const Event &event)
{
char s[100];
int first, last;
@@ -476,21 +476,21 @@ BOOL CModel::EventProcess(const Event &event) }
if ( event.param == VK_ADD ) // numpad?
{
- if ( event.keyState & KS_SHIFT ) CurrentSelect(TRUE);
+ if ( event.keyState & KS_SHIFT ) CurrentSelect(true);
CurrentSearchNext(+1, (event.keyState & KS_CONTROL));
}
if ( event.param == VK_SUBTRACT ) // least numpad?
{
- if ( event.keyState & KS_SHIFT ) CurrentSelect(TRUE);
+ if ( event.keyState & KS_SHIFT ) CurrentSelect(true);
CurrentSearchNext(-1, (event.keyState & KS_CONTROL));
}
if ( event.param == VK_NUMPAD0 )
{
- CurrentSelect(FALSE);
+ CurrentSelect(false);
}
if ( event.param == VK_DECIMAL )
{
- CurrentSelect(TRUE);
+ CurrentSelect(true);
}
if ( event.param == VK_END )
{
@@ -507,12 +507,12 @@ BOOL CModel::EventProcess(const Event &event) if ( event.param == VK_SPACE )
{
m_bDisplayTransparent = !m_bDisplayTransparent;
- m_bDisplayOnlySelection = FALSE;
+ m_bDisplayOnlySelection = false;
}
if ( event.param == 'H' )
{
m_bDisplayOnlySelection = !m_bDisplayOnlySelection;
- m_bDisplayTransparent = FALSE;
+ m_bDisplayTransparent = false;
}
if ( m_mode == 1 )
{
@@ -719,7 +719,7 @@ BOOL CModel::EventProcess(const Event &event) case EVENT_BUTTON3: // read ?
GetModelName(s);
- m_modFile->ReadModel(s, TRUE, FALSE); // standard read with borders
+ m_modFile->ReadModel(s, true, false); // standard read with borders
DeselectAll();
CurrentInit();
EventFrame(event);
@@ -729,7 +729,7 @@ BOOL CModel::EventProcess(const Event &event) case EVENT_BUTTON4: // add ?
GetModelName(s);
first = m_modFile->RetTriangleUsed();
- m_modFile->AddModel(s, first, TRUE, FALSE); // standard read with borders
+ m_modFile->AddModel(s, first, true, false); // standard read with borders
last = m_modFile->RetTriangleUsed();
SelectZone(first, last);
EventFrame(event);
@@ -777,7 +777,7 @@ BOOL CModel::EventProcess(const Event &event) // Drives the model.
-BOOL CModel::EventFrame(const Event &event)
+bool CModel::EventFrame(const Event &event)
{
D3DMATERIAL7 matCurrent, matCurrenti, matCurrents, matTrans;
D3DMATERIAL7* pMat;
@@ -853,7 +853,7 @@ BOOL CModel::EventFrame(const Event &event) m_engine->AddTriangle(objRank, &m_triangleTable[i].p1, 3,
*pMat, state,
m_triangleTable[i].texName, "",
- 0.0f, 1000000.0f, FALSE);
+ 0.0f, 1000000.0f, false);
}
else
{
@@ -861,7 +861,7 @@ BOOL CModel::EventFrame(const Event &event) m_engine->AddTriangle(objRank, &m_triangleTable[i].p1, 3,
*pMat, state|D3DSTATEDUALb,
m_triangleTable[i].texName, texName2,
- 0.0f, 1000000.0f, FALSE);
+ 0.0f, 1000000.0f, false);
}
if ( m_bDisplayTransparent && // draws inside?
@@ -875,66 +875,66 @@ BOOL CModel::EventFrame(const Event &event) m_engine->AddTriangle(objRank, vertex, 3,
matCurrenti, D3DSTATENORMAL,
m_triangleTable[i].texName, "",
- 0.0f, 1000000.0f, FALSE);
+ 0.0f, 1000000.0f, false);
}
}
- return TRUE;
+ return true;
}
// Gives a vertex.
-BOOL CModel::GetVertex(int rank, D3DVERTEX2 &vertex)
+bool CModel::GetVertex(int rank, D3DVERTEX2 &vertex)
{
- if ( rank < 0 || rank/3 >= m_modFile->RetTriangleUsed() ) return FALSE;
- if ( !m_triangleTable[rank/3].bUsed ) return FALSE;
+ if ( rank < 0 || rank/3 >= m_modFile->RetTriangleUsed() ) return false;
+ if ( !m_triangleTable[rank/3].bUsed ) return false;
- if ( !m_triangleTable[rank/3].bSelect ) return FALSE;
+ if ( !m_triangleTable[rank/3].bSelect ) return false;
if ( rank%3 == 0 )
{
vertex = m_triangleTable[rank/3].p1;
- return TRUE;
+ return true;
}
if ( rank%3 == 1 )
{
vertex = m_triangleTable[rank/3].p2;
- return TRUE;
+ return true;
}
if ( rank%3 == 2 )
{
vertex = m_triangleTable[rank/3].p3;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// Modifies a vertex.
-BOOL CModel::SetVertex(int rank, D3DVERTEX2 &vertex)
+bool CModel::SetVertex(int rank, D3DVERTEX2 &vertex)
{
- if ( rank < 0 || rank/3 >= m_modFile->RetTriangleUsed() ) return FALSE;
- if ( !m_triangleTable[rank/3].bUsed ) return FALSE;
+ if ( rank < 0 || rank/3 >= m_modFile->RetTriangleUsed() ) return false;
+ if ( !m_triangleTable[rank/3].bUsed ) return false;
- if ( !m_triangleTable[rank/3].bSelect ) return FALSE;
+ if ( !m_triangleTable[rank/3].bSelect ) return false;
if ( rank%3 == 0 )
{
m_triangleTable[rank/3].p1 = vertex;
- return TRUE;
+ return true;
}
if ( rank%3 == 1 )
{
m_triangleTable[rank/3].p2 = vertex;
- return TRUE;
+ return true;
}
if ( rank%3 == 2 )
{
m_triangleTable[rank/3].p3 = vertex;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// Smoothed normals selected triangles.
@@ -952,12 +952,12 @@ void CModel::SmoothSelect() bDone = (char*)malloc(used*3*sizeof(char));
for ( i=0 ; i<used*3 ; i++ )
{
- bDone[i] = FALSE;
+ bDone[i] = false;
}
for ( i=0 ; i<used*3 ; i++ )
{
- bDone[i] = TRUE;
+ bDone[i] = true;
rank = 0;
index[rank++] = i;
if ( !GetVertex(i, vi) ) continue;
@@ -970,7 +970,7 @@ void CModel::SmoothSelect() vj.y == vi.y &&
vj.z == vi.z )
{
- bDone[j] = TRUE;
+ bDone[j] = true;
index[rank++] = j;
if ( rank >= 100 ) break;
}
@@ -1234,7 +1234,7 @@ void CModel::ReadScript(char *filename) char buffer[200];
int i, first, last;
D3DVECTOR move;
- BOOL bFirst = TRUE;
+ bool bFirst = true;
file = fopen(filename, "r");
if ( file == NULL ) return;
@@ -1258,18 +1258,18 @@ void CModel::ReadScript(char *filename) if ( bFirst )
{
- m_modFile->ReadModel(buffer, TRUE, TRUE);
+ m_modFile->ReadModel(buffer, true, true);
last = m_modFile->RetTriangleUsed();
SelectZone(0, last);
}
else
{
first = m_modFile->RetTriangleUsed();
- m_modFile->AddModel(buffer, first, TRUE, FALSE);
+ m_modFile->AddModel(buffer, first, true, false);
last = m_modFile->RetTriangleUsed();
SelectZone(first, last);
}
- bFirst = FALSE;
+ bFirst = false;
move = OpDir(line, "zoom");
OperSelect(move, 'Z');
@@ -1358,7 +1358,7 @@ D3DVECTOR CModel::RetSelectNormal() // Maps a texture onto the selected triangles.
-BOOL CModel::IsMappingSelectPlausible(D3DMaping D3Dmode)
+bool CModel::IsMappingSelectPlausible(D3DMaping D3Dmode)
{
D3DVERTEX2 vertex[3];
D3DVECTOR min, max;
@@ -1428,18 +1428,18 @@ BOOL CModel::IsMappingSelectPlausible(D3DMaping D3Dmode) }
if ( vertex[0].tu == vertex[1].tu &&
- vertex[0].tu == vertex[2].tu ) return FALSE;
+ vertex[0].tu == vertex[2].tu ) return false;
if ( vertex[0].tv == vertex[1].tv &&
- vertex[0].tv == vertex[2].tv ) return FALSE;
+ vertex[0].tv == vertex[2].tv ) return false;
}
- return TRUE;
+ return true;
}
// Maps a texture onto the selected triangles.
-void CModel::MappingSelect(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY,
+void CModel::MappingSelect(int mode, int rotate, bool bMirrorX, bool bMirrorY,
FPOINT ti, FPOINT ts, char *texName)
{
D3DVERTEX2 vertex;
@@ -1448,7 +1448,7 @@ void CModel::MappingSelect(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY, D3DMaping D3Dmode;
float au, bu, av, bv;
int used, i;
- BOOL bPlausible[3];
+ bool bPlausible[3];
DefaultSelect();
@@ -1558,7 +1558,7 @@ void CModel::MappingSelect(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY, // Maps a texture onto the selected triangles.
-void CModel::MappingSelectSpherical(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY,
+void CModel::MappingSelectSpherical(int mode, int rotate, bool bMirrorX, bool bMirrorY,
FPOINT ti, FPOINT ts, char *texName)
{
D3DVERTEX2 vertex;
@@ -1649,7 +1649,7 @@ D3DVECTOR CModel::RetMappingCenter(D3DVECTOR pos, D3DVECTOR min) // Maps a texture onto the selected triangles.
-void CModel::MappingSelectCylindrical(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY,
+void CModel::MappingSelectCylindrical(int mode, int rotate, bool bMirrorX, bool bMirrorY,
FPOINT ti, FPOINT ts, char *texName)
{
D3DVERTEX2 vertex;
@@ -1751,7 +1751,7 @@ void CModel::MappingSelectCylindrical(int mode, int rotate, BOOL bMirrorX, BOOL // Maps a texture onto the selected triangles.
-void CModel::MappingSelectFace(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY,
+void CModel::MappingSelectFace(int mode, int rotate, bool bMirrorX, bool bMirrorY,
FPOINT ti, FPOINT ts, char *texName)
{
D3DVERTEX2 vertex[3];
@@ -1825,7 +1825,7 @@ void CModel::MappingSelectFace(int mode, int rotate, BOOL bMirrorX, BOOL bMirror void CModel::MappingSelect2(int texNum2, int subdiv,
int offsetU, int offsetV,
- BOOL bMirrorX, BOOL bMirrorY)
+ bool bMirrorX, bool bMirrorY)
{
D3DVERTEX2 vertex;
D3DVECTOR min, max, center, p;
@@ -1901,7 +1901,7 @@ void CModel::MappingSelect2(int texNum2, int subdiv, // Maps a secondary texture on flat.
-void CModel::MappingSelectPlane2(int mode, BOOL bMirrorX, BOOL bMirrorY)
+void CModel::MappingSelectPlane2(int mode, bool bMirrorX, bool bMirrorY)
{
D3DVERTEX2 vertex;
D3DVECTOR min, max;
@@ -1981,7 +1981,7 @@ void CModel::MappingSelectPlane2(int mode, BOOL bMirrorX, BOOL bMirrorY) // Maps a texture onto the selected triangles.
-void CModel::MappingSelectSpherical2(BOOL bMirrorX, BOOL bMirrorY)
+void CModel::MappingSelectSpherical2(bool bMirrorX, bool bMirrorY)
{
D3DVERTEX2 vertex;
D3DVECTOR min, max, center, dim, p;
@@ -2033,7 +2033,7 @@ void CModel::MappingSelectSpherical2(BOOL bMirrorX, BOOL bMirrorY) // Maps a texture onto the selected triangles.
-void CModel::MappingSelectMagic2(BOOL bMirrorX, BOOL bMirrorY)
+void CModel::MappingSelectMagic2(bool bMirrorX, bool bMirrorY)
{
D3DVERTEX2 vertex, v[3];
D3DVECTOR min, max, au, bu, av, bv, n;
@@ -2180,7 +2180,7 @@ int CModel::SearchSamePlane(int first, int step) // Seeks the next triangle.
-void CModel::CurrentSearchNext(int step, BOOL bControl)
+void CModel::CurrentSearchNext(int step, bool bControl)
{
if ( step > 0 ) // forward?
{
@@ -2247,7 +2247,7 @@ void CModel::CurrentInit() // Selects the current triangles.
-void CModel::CurrentSelect(BOOL bSelect)
+void CModel::CurrentSelect(bool bSelect)
{
int i;
@@ -2267,7 +2267,7 @@ void CModel::DeselectAll() used = m_modFile->RetTriangleUsed();
for ( i=0 ; i<used ; i++ )
{
- m_triangleTable[i].bSelect = FALSE;
+ m_triangleTable[i].bSelect = false;
}
}
@@ -2280,10 +2280,10 @@ void CModel::SelectZone(int first, int last) used = m_modFile->RetTriangleUsed();
for ( i=0 ; i<used ; i++ )
{
- m_triangleTable[i].bSelect = FALSE;
+ m_triangleTable[i].bSelect = false;
if ( i >= first && i < last )
{
- m_triangleTable[i].bSelect = TRUE;
+ m_triangleTable[i].bSelect = true;
}
}
m_triangleSel1 = first;
@@ -2302,7 +2302,7 @@ void CModel::SelectAll() if ( m_triangleTable[i].min == m_min &&
m_triangleTable[i].max == m_max )
{
- m_triangleTable[i].bSelect = TRUE;
+ m_triangleTable[i].bSelect = true;
}
}
}
@@ -2338,7 +2338,7 @@ void CModel::DefaultSelect() used = m_modFile->RetTriangleUsed();
for ( i=m_triangleSel1 ; i<=m_triangleSel2 ; i++ )
{
- m_triangleTable[i].bSelect = TRUE;
+ m_triangleTable[i].bSelect = true;
}
}
@@ -2357,7 +2357,7 @@ void CModel::SelectDelete() {
if ( m_triangleTable[i].bSelect )
{
- m_triangleTable[i].bUsed = FALSE;
+ m_triangleTable[i].bUsed = false;
}
}
diff --git a/src/graphics/common/model.h b/src/graphics/common/model.h index e7b6b10..30daf24 100644 --- a/src/graphics/common/model.h +++ b/src/graphics/common/model.h @@ -38,7 +38,7 @@ public: void StartUserAction();
void StopUserAction();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void InitView();
void InitViewFromSelect();
@@ -46,9 +46,9 @@ public: void ViewMove(const Event &event, float speed);
protected:
- BOOL EventFrame(const Event &event);
- BOOL GetVertex(int rank, D3DVERTEX2 &vertex);
- BOOL SetVertex(int rank, D3DVERTEX2 &vertex);
+ bool EventFrame(const Event &event);
+ bool GetVertex(int rank, D3DVERTEX2 &vertex);
+ bool SetVertex(int rank, D3DVERTEX2 &vertex);
D3DVECTOR RetSelectCDG();
D3DVECTOR RetSelectNormal();
void SmoothSelect();
@@ -59,21 +59,21 @@ protected: void OperSelect(D3DVECTOR move, char oper);
void ReadScript(char *filename);
void BBoxCompute(D3DVECTOR &min, D3DVECTOR &max);
- BOOL IsMappingSelectPlausible(D3DMaping D3Dmode);
- void MappingSelect(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY, FPOINT ti, FPOINT ts, char *texName);
- void MappingSelectSpherical(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY, FPOINT ti, FPOINT ts, char *texName);
+ bool IsMappingSelectPlausible(D3DMaping D3Dmode);
+ void MappingSelect(int mode, int rotate, bool bMirrorX, bool bMirrorY, FPOINT ti, FPOINT ts, char *texName);
+ void MappingSelectSpherical(int mode, int rotate, bool bMirrorX, bool bMirrorY, FPOINT ti, FPOINT ts, char *texName);
D3DVECTOR RetMappingCenter(D3DVECTOR pos, D3DVECTOR min);
- void MappingSelectCylindrical(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY, FPOINT ti, FPOINT ts, char *texName);
- void MappingSelectFace(int mode, int rotate, BOOL bMirrorX, BOOL bMirrorY, FPOINT ti, FPOINT ts, char *texName);
- void MappingSelect2(int texNum2, int subdiv, int offsetU, int offsetV, BOOL bMirrorX, BOOL bMirrorY);
- void MappingSelectPlane2(int mode, BOOL bMirrorX, BOOL bMirrorY);
- void MappingSelectSpherical2(BOOL bMirrorX, BOOL bMirrorY);
- void MappingSelectMagic2(BOOL bMirrorX, BOOL bMirrorY);
+ void MappingSelectCylindrical(int mode, int rotate, bool bMirrorX, bool bMirrorY, FPOINT ti, FPOINT ts, char *texName);
+ void MappingSelectFace(int mode, int rotate, bool bMirrorX, bool bMirrorY, FPOINT ti, FPOINT ts, char *texName);
+ void MappingSelect2(int texNum2, int subdiv, int offsetU, int offsetV, bool bMirrorX, bool bMirrorY);
+ void MappingSelectPlane2(int mode, bool bMirrorX, bool bMirrorY);
+ void MappingSelectSpherical2(bool bMirrorX, bool bMirrorY);
+ void MappingSelectMagic2(bool bMirrorX, bool bMirrorY);
int SearchNext(int rank, int step);
int SearchSamePlane(int first, int step);
- void CurrentSearchNext(int step, BOOL bControl);
+ void CurrentSearchNext(int step, bool bControl);
void CurrentInit();
- void CurrentSelect(BOOL bSelect);
+ void CurrentSelect(bool bSelect);
void DeselectAll();
void SelectAll();
void SelectZone(int first, int last);
@@ -93,7 +93,7 @@ protected: void GetModelName(char *buffer);
void GetDXFName(char *buffer);
void GetScriptName(char *buffer);
- BOOL IsEditFocus();
+ bool IsEditFocus();
protected:
CInstanceManager* m_iMan;
@@ -108,15 +108,15 @@ protected: int m_mode;
int m_textureMode;
int m_textureRotate;
- BOOL m_bTextureMirrorX;
- BOOL m_bTextureMirrorY;
+ bool m_bTextureMirrorX;
+ bool m_bTextureMirrorY;
FPOINT m_textureInf;
FPOINT m_textureSup;
int m_texturePart;
int m_textureRank;
char m_textureName[20];
- BOOL m_bDisplayTransparent;
- BOOL m_bDisplayOnlySelection;
+ bool m_bDisplayTransparent;
+ bool m_bDisplayOnlySelection;
float m_viewHeight;
float m_viewDist;
float m_viewAngleH;
diff --git a/src/graphics/common/particule.cpp b/src/graphics/common/particule.cpp index e7bdea3..d84ca22 100644 --- a/src/graphics/common/particule.cpp +++ b/src/graphics/common/particule.cpp @@ -51,7 +51,7 @@ // Check if an object can be destroyed, but is not an enemy.
-BOOL IsSoft(ObjectType type)
+bool IsSoft(ObjectType type)
{
return ( type == OBJECT_HUMAN ||
type == OBJECT_MOBILEfa ||
@@ -101,7 +101,7 @@ BOOL IsSoft(ObjectType type) // Check if an object is a destroyable enemy.
-BOOL IsAlien(ObjectType type)
+bool IsAlien(ObjectType type)
{
return ( type == OBJECT_ANT ||
type == OBJECT_SPIDER ||
@@ -169,7 +169,7 @@ void CParticule::FlushParticule() for ( i=0 ; i<MAXPARTICULE*MAXPARTITYPE ; i++ )
{
- m_particule[i].bUsed = FALSE;
+ m_particule[i].bUsed = false;
}
for ( i=0 ; i<MAXPARTITYPE ; i++ )
@@ -182,7 +182,7 @@ void CParticule::FlushParticule() for ( i=0 ; i<MAXTRACK ; i++ )
{
- m_track[i].bUsed = FALSE;
+ m_track[i].bUsed = false;
}
m_wheelTraceTotal = 0;
@@ -190,7 +190,7 @@ void CParticule::FlushParticule() for ( i=0 ; i<SH_MAX ; i++ )
{
- m_bFrameUpdate[i] = TRUE;
+ m_bFrameUpdate[i] = true;
}
m_fogTotal = 0;
@@ -208,7 +208,7 @@ void CParticule::FlushParticule(int sheet) if ( !m_particule[i].bUsed ) continue;
if ( m_particule[i].sheet != sheet ) continue;
- m_particule[i].bUsed = FALSE;
+ m_particule[i].bUsed = false;
}
for ( i=0 ; i<MAXPARTITYPE ; i++ )
@@ -218,7 +218,7 @@ void CParticule::FlushParticule(int sheet) for ( i=0 ; i<MAXTRACK ; i++ )
{
- m_track[i].bUsed = FALSE;
+ m_track[i].bUsed = false;
}
if ( sheet == SH_WORLD )
@@ -396,8 +396,8 @@ int CParticule::CreateParticule(D3DVECTOR pos, D3DVECTOR speed, FPOINT dim, if ( !m_particule[i].bUsed )
{
ZeroMemory(&m_particule[i], sizeof(Particule));
- m_particule[i].bUsed = TRUE;
- m_particule[i].bRay = FALSE;
+ m_particule[i].bUsed = true;
+ m_particule[i].bRay = false;
m_particule[i].uniqueStamp = m_uniqueStamp++;
m_particule[i].sheet = sheet;
m_particule[i].mass = mass;
@@ -472,8 +472,8 @@ int CParticule::CreateFrag(D3DVECTOR pos, D3DVECTOR speed, if ( !m_particule[i].bUsed )
{
ZeroMemory(&m_particule[i], sizeof(Particule));
- m_particule[i].bUsed = TRUE;
- m_particule[i].bRay = FALSE;
+ m_particule[i].bUsed = true;
+ m_particule[i].bRay = false;
m_particule[i].uniqueStamp = m_uniqueStamp++;
m_particule[i].sheet = sheet;
m_particule[i].mass = mass;
@@ -577,8 +577,8 @@ int CParticule::CreatePart(D3DVECTOR pos, D3DVECTOR speed, if ( !m_particule[i].bUsed )
{
ZeroMemory(&m_particule[i], sizeof(Particule));
- m_particule[i].bUsed = TRUE;
- m_particule[i].bRay = FALSE;
+ m_particule[i].bUsed = true;
+ m_particule[i].bRay = false;
m_particule[i].uniqueStamp = m_uniqueStamp++;
m_particule[i].sheet = sheet;
m_particule[i].mass = mass;
@@ -638,8 +638,8 @@ int CParticule::CreateRay(D3DVECTOR pos, D3DVECTOR goal, if ( !m_particule[i].bUsed )
{
ZeroMemory(&m_particule[i], sizeof(Particule));
- m_particule[i].bUsed = TRUE;
- m_particule[i].bRay = TRUE;
+ m_particule[i].bUsed = true;
+ m_particule[i].bRay = true;
m_particule[i].uniqueStamp = m_uniqueStamp++;
m_particule[i].sheet = sheet;
m_particule[i].mass = 0.0f;
@@ -696,7 +696,7 @@ int CParticule::CreateTrack(D3DVECTOR pos, D3DVECTOR speed, FPOINT dim, if ( !CheckChannel(rank) ) return -1;
m_particule[rank].trackRank = i;
- m_track[i].bUsed = TRUE;
+ m_track[i].bUsed = true;
m_track[i].step = (length/duration)/MAXTRACKLEN;
m_track[i].last = 0.0f;
m_track[i].intensity = 1.0f;
@@ -762,34 +762,34 @@ void CParticule::CreateWheelTrace(const D3DVECTOR &p1, const D3DVECTOR &p2, // Check a channel number.
// Adapts the channel so it can be used as an offset in m_particule.
-BOOL CParticule::CheckChannel(int &channel)
+bool CParticule::CheckChannel(int &channel)
{
int uniqueStamp;
uniqueStamp = (channel>>16)&0xffff;
channel &= 0xffff;
- if ( channel < 0 ) return FALSE;
- if ( channel >= MAXPARTICULE*MAXPARTITYPE ) return FALSE;
+ if ( channel < 0 ) return false;
+ if ( channel >= MAXPARTICULE*MAXPARTITYPE ) return false;
#if 0
- if ( !m_particule[channel].bUsed ) return FALSE;
+ if ( !m_particule[channel].bUsed ) return false;
- if ( m_particule[channel].uniqueStamp != uniqueStamp ) return FALSE;
+ if ( m_particule[channel].uniqueStamp != uniqueStamp ) return false;
#else
if ( !m_particule[channel].bUsed )
{
- OutputDebugString("CheckChannel bUsed=FALSE !\n");
- return FALSE;
+ OutputDebugString("CheckChannel bUsed=false !\n");
+ return false;
}
if ( m_particule[channel].uniqueStamp != uniqueStamp )
{
OutputDebugString("CheckChannel uniqueStamp !\n");
- return FALSE;
+ return false;
}
#endif
- return TRUE;
+ return true;
}
// Removes a particle after his rank.
@@ -806,10 +806,10 @@ void CParticule::DeleteRank(int rank) i = m_particule[rank].trackRank;
if ( i != -1 ) // drag associated?
{
- m_track[i].bUsed = FALSE; // frees the drag
+ m_track[i].bUsed = false; // frees the drag
}
- m_particule[rank].bUsed = FALSE;
+ m_particule[rank].bUsed = false;
}
// Removes all particles of a given type.
@@ -843,10 +843,10 @@ void CParticule::DeleteParticule(int channel) i = m_particule[channel].trackRank;
if ( i != -1 ) // drag associated?
{
- m_track[i].bUsed = FALSE; // frees the drag
+ m_track[i].bUsed = false; // frees the drag
}
- m_particule[channel].bUsed = FALSE;
+ m_particule[channel].bUsed = false;
}
@@ -917,17 +917,17 @@ void CParticule::SetPhase(int channel, ParticulePhase phase, float duration) // Returns the position of the particle.
-BOOL CParticule::GetPosition(int channel, D3DVECTOR &pos)
+bool CParticule::GetPosition(int channel, D3DVECTOR &pos)
{
- if ( !CheckChannel(channel) ) return FALSE;
+ if ( !CheckChannel(channel) ) return false;
pos = m_particule[channel].pos;
- return TRUE;
+ return true;
}
// Indicates whether a sheet evolves or not.
-void CParticule::SetFrameUpdate(int sheet, BOOL bUpdate)
+void CParticule::SetFrameUpdate(int sheet, bool bUpdate)
{
m_bFrameUpdate[sheet] = bUpdate;
}
@@ -939,7 +939,7 @@ void CParticule::FrameParticule(float rTime) CObject* object;
D3DVECTOR eye, pos, speed, wind;
FPOINT ts, ti, dim;
- BOOL bPause;
+ bool bPause;
float progress, dp, h, duration, mass, amplitude;
int i, j, r, total;
@@ -1003,7 +1003,7 @@ void CParticule::FrameParticule(float rTime) }
else
{
- h = m_terrain->RetFloorLevel(m_particule[i].pos, TRUE);
+ h = m_terrain->RetFloorLevel(m_particule[i].pos, true);
}
h += m_particule[i].dim.y*0.75f;
if ( m_particule[i].pos.y < h ) // impact with the ground?
@@ -1305,14 +1305,14 @@ void CParticule::FrameParticule(float rTime) {
m_particule[i].testTime = 0.0f;
- if ( m_terrain->RetFloorHeight(m_particule[i].pos, TRUE) < -2.0f )
+ if ( m_terrain->RetFloorHeight(m_particule[i].pos, true) < -2.0f )
{
m_exploGunCounter ++;
if ( m_exploGunCounter%2 == 0 )
{
pos = m_particule[i].goal;
- m_terrain->MoveOnFloor(pos, TRUE);
+ m_terrain->MoveOnFloor(pos, true);
speed.x = 0.0f;
speed.z = 0.0f;
speed.y = 0.0f;
@@ -1499,14 +1499,14 @@ void CParticule::FrameParticule(float rTime) {
m_particule[i].testTime = 0.0f;
- if ( m_terrain->RetFloorHeight(m_particule[i].pos, TRUE) < -2.0f )
+ if ( m_terrain->RetFloorHeight(m_particule[i].pos, true) < -2.0f )
{
m_exploGunCounter ++;
if ( m_exploGunCounter%2 == 0 )
{
pos = m_particule[i].goal;
- m_terrain->MoveOnFloor(pos, TRUE);
+ m_terrain->MoveOnFloor(pos, true);
speed.x = 0.0f;
speed.z = 0.0f;
speed.y = 0.0f;
@@ -2748,13 +2748,13 @@ void CParticule::FrameParticule(float rTime) // Moves a drag.
// Returns true if the drag is finished.
-BOOL CParticule::TrackMove(int i, D3DVECTOR pos, float progress)
+bool CParticule::TrackMove(int i, D3DVECTOR pos, float progress)
{
D3DVECTOR last;
int h, hh;
- if ( i < 0 || i >= MAXTRACK ) return TRUE;
- if ( m_track[i].bUsed == FALSE ) return TRUE;
+ if ( i < 0 || i >= MAXTRACK ) return true;
+ if ( m_track[i].bUsed == false ) return true;
if ( progress < 1.0f ) // particle exists?
{
@@ -3286,7 +3286,7 @@ void CParticule::DrawParticuleRay(int i) D3DMATRIX matrix;
D3DVECTOR corner[4], eye, pos, goal, n, angle, proj;
FPOINT dim, texInf, texSup;
- BOOL bLeft;
+ bool bLeft;
float a, len, adv, prop, vario1, vario2;
int r, rank, step, first, last;
@@ -3810,14 +3810,14 @@ void CParticule::DrawParticule(int sheet) {
D3DMATERIAL7 mat;
D3DMATRIX matrix;
- BOOL bLoadTexture;
+ bool bLoadTexture;
char name[20];
int state, t, i, j, r;
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, TRUE);
-//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, true);
+//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
// Draw the basic particles of triangles.
if ( m_totalInterface[0][sheet] > 0 )
@@ -3836,7 +3836,7 @@ void CParticule::DrawParticule(int sheet) }
// Draw the particles was calculated based on edge.
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false);
ZeroMemory( &mat, sizeof(D3DMATERIAL7) );
mat.diffuse.r = 1.0f;
@@ -3870,7 +3870,7 @@ void CParticule::DrawParticule(int sheet) {
if ( m_totalInterface[t][sheet] == 0 ) continue;
- bLoadTexture = FALSE;
+ bLoadTexture = false;
if ( t == 4 ) state = D3DSTATETTw; // text.tga
else state = D3DSTATETTb; // effect[00..02].tga
@@ -3886,7 +3886,7 @@ void CParticule::DrawParticule(int sheet) {
NameParticule(name, t);
m_engine->SetTexture(name);
- bLoadTexture = TRUE;
+ bLoadTexture = true;
}
r = m_particule[i].trackRank;
@@ -3932,8 +3932,8 @@ void CParticule::DrawParticule(int sheet) }
}
-//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, TRUE);
+//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, true);
}
@@ -3945,10 +3945,10 @@ CObject* CParticule::SearchObjectGun(D3DVECTOR old, D3DVECTOR pos, CObject *pObj, *pBest;
D3DVECTOR box1, box2, oPos, p;
ObjectType oType;
- BOOL bShield;
+ bool bShield;
float min, oRadius, dist, shieldRadius;
int i, j;
- BOOL bHimself;
+ bool bHimself;
if ( m_main->RetMovieLock() ) return 0; // current movie?
@@ -3971,7 +3971,7 @@ CObject* CParticule::SearchObjectGun(D3DVECTOR old, D3DVECTOR pos, box2.z += min;
pBest = 0;
- bShield = FALSE;
+ bShield = false;
for ( i=0 ; i<1000000 ; i++ )
{
pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i);
@@ -4048,7 +4048,7 @@ CObject* CParticule::SearchObjectGun(D3DVECTOR old, D3DVECTOR pos, if ( dist <= shieldRadius )
{
pBest = pObj;
- bShield = TRUE;
+ bShield = true;
}
}
}
@@ -4250,7 +4250,7 @@ D3DCOLORVALUE CParticule::RetFogColor(D3DVECTOR pos) // Writes a file. BMP containing all the tire tracks.
-BOOL CParticule::WriteWheelTrace(char *filename, int width, int height,
+bool CParticule::WriteWheelTrace(char *filename, int width, int height,
D3DVECTOR dl, D3DVECTOR ur)
{
HDC hDC;
@@ -4266,13 +4266,13 @@ BOOL CParticule::WriteWheelTrace(char *filename, int width, int height, POINT list[4];
int i;
- if ( !m_engine->GetRenderDC(hDC) ) return FALSE;
+ if ( !m_engine->GetRenderDC(hDC) ) return false;
hDCImage = CreateCompatibleDC(hDC);
if ( hDCImage == 0 )
{
m_engine->ReleaseRenderDC(hDC);
- return FALSE;
+ return false;
}
hb = CreateCompatibleBitmap(hDC, width, height);
@@ -4280,7 +4280,7 @@ BOOL CParticule::WriteWheelTrace(char *filename, int width, int height, {
DeleteDC(hDCImage);
m_engine->ReleaseRenderDC(hDC);
- return FALSE;
+ return false;
}
SelectObject(hDCImage, hb);
@@ -4360,7 +4360,7 @@ BOOL CParticule::WriteWheelTrace(char *filename, int width, int height, DeleteObject(hb);
DeleteDC(hDCImage);
m_engine->ReleaseRenderDC(hDC);
- return FALSE;
+ return false;
}
m_engine->CreateBMPFile(filename, info, hb, hDCImage);
@@ -4368,6 +4368,6 @@ BOOL CParticule::WriteWheelTrace(char *filename, int width, int height, DeleteObject(hb);
DeleteDC(hDCImage);
m_engine->ReleaseRenderDC(hDC);
- return TRUE;
+ return true;
}
diff --git a/src/graphics/common/particule.h b/src/graphics/common/particule.h index 54a6428..06fca92 100644 --- a/src/graphics/common/particule.h +++ b/src/graphics/common/particule.h @@ -200,8 +200,8 @@ enum ParticulePhase typedef struct
{
- char bUsed; // TRUE -> particle used
- char bRay; // TRUE -> ray with goal
+ char bUsed; // true -> particle used
+ char bRay; // true -> ray with goal
unsigned short uniqueStamp; // unique mark
short sheet; // sheet (0..n)
ParticuleType type; // type PARTI*
@@ -232,7 +232,7 @@ Particule; typedef struct
{
- char bUsed; // TRUE -> drag used
+ char bUsed; // true -> drag used
char bDrawParticule;
float step; // duration of not
float last; // increase last not memorized
@@ -282,19 +282,19 @@ public: void SetIntensity(int channel, float intensity);
void SetParam(int channel, D3DVECTOR pos, FPOINT dim, float zoom, float angle, float intensity);
void SetPhase(int channel, ParticulePhase phase, float duration);
- BOOL GetPosition(int channel, D3DVECTOR &pos);
+ bool GetPosition(int channel, D3DVECTOR &pos);
D3DCOLORVALUE RetFogColor(D3DVECTOR pos);
- void SetFrameUpdate(int sheet, BOOL bUpdate);
+ void SetFrameUpdate(int sheet, bool bUpdate);
void FrameParticule(float rTime);
void DrawParticule(int sheet);
- BOOL WriteWheelTrace(char *filename, int width, int height, D3DVECTOR dl, D3DVECTOR ur);
+ bool WriteWheelTrace(char *filename, int width, int height, D3DVECTOR dl, D3DVECTOR ur);
protected:
void DeleteRank(int rank);
- BOOL CheckChannel(int &channel);
+ bool CheckChannel(int &channel);
void DrawParticuleTriangle(int i);
void DrawParticuleNorm(int i);
void DrawParticuleFlat(int i);
@@ -306,7 +306,7 @@ protected: CObject* SearchObjectGun(D3DVECTOR old, D3DVECTOR pos, ParticuleType type, CObject *father);
CObject* SearchObjectRay(D3DVECTOR pos, D3DVECTOR goal, ParticuleType type, CObject *father);
void Play(Sound sound, D3DVECTOR pos, float amplitude);
- BOOL TrackMove(int i, D3DVECTOR pos, float progress);
+ bool TrackMove(int i, D3DVECTOR pos, float progress);
void TrackDraw(int i, ParticuleType type);
protected:
@@ -325,7 +325,7 @@ protected: int m_wheelTraceIndex;
WheelTrace m_wheelTrace[MAXWHEELTRACE];
int m_totalInterface[MAXPARTITYPE][SH_MAX];
- BOOL m_bFrameUpdate[SH_MAX];
+ bool m_bFrameUpdate[SH_MAX];
int m_fogTotal;
int m_fog[MAXPARTIFOG];
int m_uniqueStamp;
diff --git a/src/graphics/common/planet.cpp b/src/graphics/common/planet.cpp index fae6d4a..68a5a64 100644 --- a/src/graphics/common/planet.cpp +++ b/src/graphics/common/planet.cpp @@ -64,11 +64,11 @@ void CPlanet::Flush() {
for ( i=0 ; i<MAXPLANET ; i++ )
{
- m_planet[j][i].bUsed = FALSE;
+ m_planet[j][i].bUsed = false;
}
}
- m_bPlanetExist = FALSE;
+ m_bPlanetExist = false;
m_mode = 0;
m_time = 0.0f;
}
@@ -76,23 +76,23 @@ void CPlanet::Flush() // Management of an event.
-BOOL CPlanet::EventProcess(const Event &event)
+bool CPlanet::EventProcess(const Event &event)
{
if ( event.event == EVENT_FRAME )
{
return EventFrame(event);
}
- return TRUE;
+ return true;
}
// Makes the planets evolve.
-BOOL CPlanet::EventFrame(const Event &event)
+bool CPlanet::EventFrame(const Event &event)
{
float a;
int i;
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
m_time += event.rTime;
@@ -109,7 +109,7 @@ BOOL CPlanet::EventFrame(const Event &event) m_planet[m_mode][i].angle.y = sinf(a)*sinf(m_planet[m_mode][i].dir)+m_planet[m_mode][i].start.y;
}
- return TRUE;
+ return true;
}
@@ -192,7 +192,7 @@ void CPlanet::Draw() // Creates a new planet.
-BOOL CPlanet::Create(int mode, FPOINT start, float dim, float speed,
+bool CPlanet::Create(int mode, FPOINT start, float dim, float speed,
float dir, char *name, FPOINT uv1, FPOINT uv2)
{
int i;
@@ -204,7 +204,7 @@ BOOL CPlanet::Create(int mode, FPOINT start, float dim, float speed, {
if ( m_planet[mode][i].bUsed ) continue;
- m_planet[mode][i].bUsed = TRUE;
+ m_planet[mode][i].bUsed = true;
m_planet[mode][i].start = start;
m_planet[mode][i].angle = start;
m_planet[mode][i].dim = dim;
@@ -217,16 +217,16 @@ BOOL CPlanet::Create(int mode, FPOINT start, float dim, float speed, m_planet[mode][i].bTGA = ( strstr(m_planet[mode][i].name, "planet") != 0 );
- m_bPlanetExist = TRUE;
- return TRUE;
+ m_bPlanetExist = true;
+ return true;
}
- return FALSE;
+ return false;
}
// Indicates if there is at least one planet.
-BOOL CPlanet::PlanetExist()
+bool CPlanet::PlanetExist()
{
return m_bPlanetExist;
}
diff --git a/src/graphics/common/planet.h b/src/graphics/common/planet.h index b931c2b..75af350 100644 --- a/src/graphics/common/planet.h +++ b/src/graphics/common/planet.h @@ -31,7 +31,7 @@ class CD3DEngine; typedef struct
{
- char bUsed; // TRUE -> planet exists
+ char bUsed; // true -> planet exists
FPOINT start; // initial position in degrees
FPOINT angle; // current position in degrees
float dim; // dimensions (0..1)
@@ -53,16 +53,16 @@ public: ~CPlanet();
void Flush();
- BOOL EventProcess(const Event &event);
- BOOL Create(int mode, FPOINT start, float dim, float speed, float dir, char *name, FPOINT uv1, FPOINT uv2);
- BOOL PlanetExist();
+ bool EventProcess(const Event &event);
+ bool Create(int mode, FPOINT start, float dim, float speed, float dir, char *name, FPOINT uv1, FPOINT uv2);
+ bool PlanetExist();
void LoadTexture();
void Draw();
void SetMode(int mode);
int RetMode();
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
CInstanceManager* m_iMan;
@@ -71,6 +71,6 @@ protected: float m_time;
int m_mode;
Planet m_planet[2][MAXPLANET];
- BOOL m_bPlanetExist;
+ bool m_bPlanetExist;
};
diff --git a/src/graphics/common/pyro.cpp b/src/graphics/common/pyro.cpp index 7de5405..6ba09c5 100644 --- a/src/graphics/common/pyro.cpp +++ b/src/graphics/common/pyro.cpp @@ -80,7 +80,7 @@ CPyro::~CPyro() // Destroys the object.
-void CPyro::DeleteObject(BOOL bAll)
+void CPyro::DeleteObject(bool bAll)
{
if ( m_lightRank != -1 )
{
@@ -92,7 +92,7 @@ void CPyro::DeleteObject(BOOL bAll) // Creates pyrotechnic effect.
-BOOL CPyro::Create(PyroType type, CObject* pObj, float force)
+bool CPyro::Create(PyroType type, CObject* pObj, float force)
{
D3DMATRIX* mat;
CObject* power;
@@ -109,7 +109,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) oType = pObj->RetType();
objRank = pObj->RetObjectRank(0);
- if ( objRank == -1 ) return FALSE;
+ if ( objRank == -1 ) return false;
m_engine->GetBBox(objRank, min, max);
pos = pObj->RetPosition(0);
@@ -161,11 +161,11 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) power = pObj->RetPower();
if ( power == 0 )
{
- m_bPower = FALSE;
+ m_bPower = false;
}
else
{
- m_bPower = TRUE;
+ m_bPower = true;
pos = power->RetPosition(0);
pos.y += 1.0f;
mat = pObj->RetWorldMatrix(0);
@@ -177,39 +177,39 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) oType == OBJECT_TNT ||
oType == OBJECT_BOMB )
{
- m_bPower = TRUE;
+ m_bPower = true;
m_posPower = m_pos;
m_posPower.y += 1.0f;
m_pos = m_posPower;
}
if ( oType == OBJECT_STATION )
{
- m_bPower = TRUE;
+ m_bPower = true;
mat = pObj->RetWorldMatrix(0);
m_posPower = Transform(*mat, D3DVECTOR(-15.0f, 7.0f, 0.0f));
m_pos = m_posPower;
}
if ( oType == OBJECT_ENERGY )
{
- m_bPower = TRUE;
+ m_bPower = true;
mat = pObj->RetWorldMatrix(0);
m_posPower = Transform(*mat, D3DVECTOR(-7.0f, 6.0f, 0.0f));
m_pos = m_posPower;
}
if ( oType == OBJECT_NUCLEAR )
{
- m_bPower = TRUE;
+ m_bPower = true;
m_posPower = m_pos;
}
if ( oType == OBJECT_PARA )
{
- m_bPower = TRUE;
+ m_bPower = true;
m_posPower = m_pos;
}
if ( oType == OBJECT_SCRAP4 ||
oType == OBJECT_SCRAP5 ) // plastic material?
{
- m_bPower = TRUE;
+ m_bPower = true;
m_posPower = m_pos;
}
@@ -258,7 +258,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) if ( type == PT_BURNT ||
type == PT_BURNO )
{
- m_soundChannel = m_sound->Play(SOUND_BURN, m_pos, 1.0f, 1.0f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_BURN, m_pos, 1.0f, 1.0f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 12.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 1.0f, 5.0f, SOPER_STOP);
}
@@ -303,7 +303,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) if ( m_type == PT_DEADG )
{
- m_object->SetDead(TRUE);
+ m_object->SetDead(true);
motion = m_object->RetMotion();
if ( motion != 0 )
@@ -313,11 +313,11 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) m_camera->StartCentering(m_object, PI*0.5f, 99.9f, 0.0f, 1.5f);
m_camera->StartOver(OE_FADEOUTw, m_pos, 1.0f);
m_speed = 1.0f/10.0f;
- return TRUE;
+ return true;
}
if ( m_type == PT_DEADW )
{
- m_object->SetDead(TRUE);
+ m_object->SetDead(true);
motion = m_object->RetMotion();
if ( motion != 0 )
@@ -327,7 +327,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) m_camera->StartCentering(m_object, PI*0.5f, 99.9f, 0.0f, 3.0f);
m_camera->StartOver(OE_FADEOUTb, m_pos, 1.0f);
m_speed = 1.0f/10.0f;
- return TRUE;
+ return true;
}
if ( m_type == PT_SHOTT ||
@@ -335,7 +335,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) {
m_camera->StartEffect(CE_SHOT, m_pos, force);
m_speed = 1.0f/1.0f;
- return TRUE;
+ return true;
}
if ( m_type == PT_SHOTH )
{
@@ -344,7 +344,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) m_camera->StartOver(OE_BLOOD, m_pos, force);
}
m_speed = 1.0f/0.2f;
- return TRUE;
+ return true;
}
if ( m_type == PT_SHOTW )
@@ -360,7 +360,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) if ( m_type == PT_WPCHECK )
{
m_speed = 1.0f/8.0f;
- m_object->SetEnable(FALSE); // object more functional
+ m_object->SetEnable(false); // object more functional
}
if ( m_type == PT_FLCREATE )
{
@@ -369,7 +369,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) if ( m_type == PT_FLDELETE )
{
m_speed = 1.0f/2.0f;
- m_object->SetEnable(FALSE); // object more functional
+ m_object->SetEnable(false); // object more functional
}
if ( m_type == PT_RESET )
{
@@ -398,7 +398,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) if ( m_type == PT_FALL )
{
FallStart();
- return TRUE;
+ return true;
}
if ( m_type == PT_BURNT ||
@@ -411,7 +411,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) LightOperAdd(0.80f, 1.0f, -0.8f, -0.8f, -0.8f); // dark gray
LightOperAdd(1.00f, 0.0f, -0.8f, -0.8f, -0.8f); // dark gray
CreateLight(m_pos, 40.0f);
- return TRUE;
+ return true;
}
if ( m_type == PT_SPIDER )
@@ -488,7 +488,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) }
}
- if ( m_type == PT_SHOTW ) return TRUE;
+ if ( m_type == PT_SHOTW ) return true;
// Generates the triangles of the explosion.
if ( m_type == PT_FRAGT ||
@@ -630,7 +630,7 @@ BOOL CPyro::Create(PyroType type, CObject* pObj, float force) }
}
- return TRUE;
+ return true;
}
// Creates an explosion with triangular form of particles.
@@ -850,7 +850,7 @@ void CPyro::DisplayError(PyroType type, CObject* pObj) // Management of an event.
-BOOL CPyro::EventProcess(const Event &event)
+bool CPyro::EventProcess(const Event &event)
{
ParticuleType type;
D3DVECTOR pos, speed, angle;
@@ -858,8 +858,8 @@ BOOL CPyro::EventProcess(const Event &event) float prog, factor, duration;
int i, r;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_engine->RetPause() ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_engine->RetPause() ) return true;
m_time += event.rTime;
m_progress += event.rTime*m_speed;
@@ -1374,7 +1374,7 @@ BOOL CPyro::EventProcess(const Event &event) LightOperFrame(event.rTime);
}
- return TRUE;
+ return true;
}
// Indicates that the object binds to the effect no longer exists, without deleting it.
@@ -1401,7 +1401,7 @@ Error CPyro::IsEnded() m_type == PT_SPIDER ||
m_type == PT_EGG )
{
- DeleteObject(TRUE, TRUE);
+ DeleteObject(true, true);
}
if ( m_type == PT_FALL ) // freight which grave?
@@ -1434,7 +1434,7 @@ Error CPyro::IsEnded() if ( m_type == PT_WPCHECK ||
m_type == PT_FLDELETE )
{
- DeleteObject(TRUE, TRUE);
+ DeleteObject(true, true);
}
if ( m_type == PT_FLCREATE )
@@ -1462,7 +1462,7 @@ Error CPyro::IsEnded() // Removes the binding to a pyrotechnic effect.
-void CPyro::DeleteObject(BOOL bPrimary, BOOL bSecondary)
+void CPyro::DeleteObject(bool bPrimary, bool bSecondary)
{
CObject *sub, *truck;
D3DVECTOR pos;
@@ -1472,7 +1472,7 @@ void CPyro::DeleteObject(BOOL bPrimary, BOOL bSecondary) if ( m_object->RetResetCap() == RESET_MOVE ) // resettable object?
{
- m_object->SetEnable(FALSE); // object cache and inactive
+ m_object->SetEnable(false); // object cache and inactive
pos = m_object->RetPosition(0);
pos.y = -100.0f;
m_object->SetPosition(0, pos);
@@ -1581,11 +1581,11 @@ void CPyro::LightOperFrame(float rTime) // Creates light to accompany a pyrotechnic effect.
-BOOL CPyro::CreateLight(D3DVECTOR pos, float height)
+bool CPyro::CreateLight(D3DVECTOR pos, float height)
{
D3DLIGHT7 light;
- if ( !m_engine->RetLightMode() ) return TRUE;
+ if ( !m_engine->RetLightMode() ) return true;
m_lightHeight = height;
@@ -1606,7 +1606,7 @@ BOOL CPyro::CreateLight(D3DVECTOR pos, float height) light.dvPhi = PI/4.0f;
m_lightRank = m_light->CreateLight();
- if ( m_lightRank == -1 ) return FALSE;
+ if ( m_lightRank == -1 ) return false;
m_light->SetLight(m_lightRank, light);
m_light->SetLightIntensity(m_lightRank, 0.0f);
@@ -1614,7 +1614,7 @@ BOOL CPyro::CreateLight(D3DVECTOR pos, float height) // Only illuminates the objects on the ground.
m_light->SetLightIncluType(m_lightRank, TYPETERRAIN);
- return TRUE;
+ return true;
}
@@ -1629,16 +1629,16 @@ void CPyro::ExploStart() m_burnType = m_object->RetType();
pos = m_object->RetPosition(0);
- m_burnFall = m_terrain->RetFloorHeight(pos, TRUE);
+ m_burnFall = m_terrain->RetFloorHeight(pos, true);
m_object->Simplify();
- m_object->SetLock(TRUE); // ruin not usable yet
- m_object->SetExplo(TRUE); // being destroyed
+ m_object->SetLock(true); // ruin not usable yet
+ m_object->SetExplo(true); // being destroyed
m_object->FlatParent();
if ( m_object->RetSelect() )
{
- m_object->SetSelect(FALSE); // deselects the object
+ m_object->SetSelect(false); // deselects the object
m_camera->SetType(CAMERA_EXPLO);
m_main->DeselectAll();
}
@@ -1678,14 +1678,14 @@ void CPyro::ExploStart() }
m_engine->LoadTexture("dirty04.tga", 1);
- DeleteObject(FALSE, TRUE); // destroys the object transported + the battery
+ DeleteObject(false, true); // destroys the object transported + the battery
}
// Ends the explosion of a vehicle.
void CPyro::ExploTerminate()
{
- DeleteObject(TRUE, FALSE); // removes the main object
+ DeleteObject(true, false); // removes the main object
}
@@ -1699,14 +1699,14 @@ void CPyro::BurnStart() m_burnType = m_object->RetType();
pos = m_object->RetPosition(0);
- m_burnFall = m_terrain->RetFloorHeight(pos, TRUE);
+ m_burnFall = m_terrain->RetFloorHeight(pos, true);
m_object->Simplify();
- m_object->SetLock(TRUE); // ruin not usable yet
+ m_object->SetLock(true); // ruin not usable yet
if ( m_object->RetSelect() )
{
- m_object->SetSelect(FALSE); // deselects the object
+ m_object->SetSelect(false); // deselects the object
m_camera->SetType(CAMERA_EXPLO);
m_main->DeselectAll();
}
@@ -2216,16 +2216,16 @@ void CPyro::BurnProgress() // Indicates whether a part should be retained.
-BOOL CPyro::BurnIsKeepPart(int part)
+bool CPyro::BurnIsKeepPart(int part)
{
int i;
i = 0;
while ( m_burnKeepPart[i] != -1 )
{
- if ( part == m_burnKeepPart[i++] ) return TRUE; // must keep
+ if ( part == m_burnKeepPart[i++] ) return true; // must keep
}
- return FALSE; // must destroy
+ return false; // must destroy
}
// Ends the fire of an insect or a vehicle.
@@ -2236,7 +2236,7 @@ void CPyro::BurnTerminate() if ( m_type == PT_BURNO ) // organic object is burning?
{
- DeleteObject(TRUE, TRUE); // removes the insect
+ DeleteObject(true, true); // removes the insect
return;
}
@@ -2249,7 +2249,7 @@ void CPyro::BurnTerminate() m_object->DeletePart(i);
}
- DeleteObject(FALSE, TRUE); // destroys the object transported + the battery
+ DeleteObject(false, true); // destroys the object transported + the battery
if ( m_burnType == OBJECT_DERRICK ||
m_burnType == OBJECT_STATION ||
@@ -2271,15 +2271,15 @@ void CPyro::BurnTerminate() m_burnType == OBJECT_END )
{
m_object->SetType(OBJECT_RUINfactory); // others become a ruin
- m_object->SetLock(FALSE);
+ m_object->SetLock(false);
}
else
{
m_object->SetType(OBJECT_RUINmobilew1); // others become a ruin
- m_object->SetLock(FALSE);
+ m_object->SetLock(false);
}
- m_object->SetBurn(FALSE); // ruin usable (c-e-d. recoverable)
+ m_object->SetBurn(false); // ruin usable (c-e-d. recoverable)
}
@@ -2289,13 +2289,13 @@ void CPyro::FallStart() {
D3DVECTOR pos;
- m_object->SetBurn(TRUE); // usable
+ m_object->SetBurn(true); // usable
pos = m_object->RetPosition(0);
m_fallFloor = m_terrain->RetFloorLevel(pos);
m_fallSpeed = 0.0f;
m_fallBulletTime = 0.0f;
- m_bFallEnding = FALSE;
+ m_bFallEnding = false;
}
// Seeking an object explode by the falling ball of bees.
@@ -2407,7 +2407,7 @@ void CPyro::FallProgress(float rTime) {
CObject* pObj;
D3DVECTOR pos;
- BOOL bFloor = FALSE;
+ bool bFloor = false;
if ( m_object == 0 ) return;
@@ -2418,7 +2418,7 @@ void CPyro::FallProgress(float rTime) if ( pos.y <= m_fallFloor ) // below the ground level?
{
pos.y = m_fallFloor;
- bFloor = TRUE;
+ bFloor = true;
}
m_object->SetPosition(0, pos);
@@ -2445,13 +2445,13 @@ void CPyro::FallProgress(float rTime) m_particule->CreateParticule(pos, D3DVECTOR(0.0f, 0.0f, 0.0f), FPOINT(6.0f, 6.0f), PARTIGUNDEL, 2.0f, 0.0f, 0.0f);
m_sound->Play(SOUND_GUNDEL);
- DeleteObject(TRUE, TRUE); // removes the ball
+ DeleteObject(true, true); // removes the ball
}
else
{
if ( pObj->ExploObject(EXPLO_BOUM, 1.0f) ) // start explosion
{
- DeleteObject(TRUE, TRUE); // removes the ball
+ DeleteObject(true, true); // removes the ball
}
else
{
@@ -2462,7 +2462,7 @@ void CPyro::FallProgress(float rTime) if ( bFloor || pObj != 0 )
{
- m_bFallEnding = TRUE;
+ m_bFallEnding = true;
}
}
}
@@ -2480,7 +2480,7 @@ Error CPyro::FallIsEnded() if ( pos.y > m_fallFloor ) return ERR_CONTINUE;
m_sound->Play(SOUND_BOUM, pos);
- m_object->SetBurn(FALSE); // usable again
+ m_object->SetBurn(false); // usable again
return ERR_STOP;
}
diff --git a/src/graphics/common/pyro.h b/src/graphics/common/pyro.h index e33b46a..b34842a 100644 --- a/src/graphics/common/pyro.h +++ b/src/graphics/common/pyro.h @@ -93,16 +93,16 @@ public: CPyro(CInstanceManager* iMan);
~CPyro();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(PyroType type, CObject* pObj, float force=1.0f);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(PyroType type, CObject* pObj, float force=1.0f);
+ bool EventProcess(const Event &event);
Error IsEnded();
void CutObjectLink(CObject* pObj);
protected:
void DisplayError(PyroType type, CObject* pObj);
- BOOL CreateLight(D3DVECTOR pos, float height);
- void DeleteObject(BOOL bPrimary, BOOL bSecondary);
+ bool CreateLight(D3DVECTOR pos, float height);
+ void DeleteObject(bool bPrimary, bool bSecondary);
void CreateTriangle(CObject* pObj, ObjectType oType, int part);
@@ -112,7 +112,7 @@ protected: void BurnStart();
void BurnAddPart(int part, D3DVECTOR pos, D3DVECTOR angle);
void BurnProgress();
- BOOL BurnIsKeepPart(int part);
+ bool BurnIsKeepPart(int part);
void BurnTerminate();
void FallStart();
@@ -138,7 +138,7 @@ protected: D3DVECTOR m_pos; // center of the effect
D3DVECTOR m_posPower; // center of the battery
- BOOL m_bPower; // battery exists?
+ bool m_bPower; // battery exists?
PyroType m_type;
float m_force;
float m_size;
@@ -163,7 +163,7 @@ protected: float m_fallFloor;
float m_fallSpeed;
float m_fallBulletTime;
- BOOL m_bFallEnding;
+ bool m_bFallEnding;
int m_crashSphereUsed; // number of spheres used
D3DVECTOR m_crashSpherePos[50];
diff --git a/src/graphics/common/terrain.cpp b/src/graphics/common/terrain.cpp index 91c4c3d..06bf90f 100644 --- a/src/graphics/common/terrain.cpp +++ b/src/graphics/common/terrain.cpp @@ -64,8 +64,8 @@ CTerrain::CTerrain(CInstanceManager* iMan) m_depth = 2;
m_texBaseName[0]= 0;
m_texBaseExt[0] = 0;
- m_bMultiText = TRUE;
- m_bLevelText = FALSE;
+ m_bMultiText = true;
+ m_bLevelText = false;
m_resources = 0;
m_levelMatTotal = 0;
m_levelMatMax = 0;
@@ -114,7 +114,7 @@ CTerrain::~CTerrain() // +---+---+---+---+
// <---------------> mosaic*brick*size
-BOOL CTerrain::Generate(int mosaic, int brickP2, float size, float vision,
+bool CTerrain::Generate(int mosaic, int brickP2, float size, float vision,
int depth, float hardness)
{
int dim;
@@ -128,8 +128,8 @@ BOOL CTerrain::Generate(int mosaic, int brickP2, float size, float vision, m_engine->SetTerrainVision(vision);
- m_bMultiText = TRUE;
- m_bLevelText = FALSE;
+ m_bMultiText = true;
+ m_bLevelText = false;
m_scaleMapping = 1.0f/(m_brick*m_size);
m_subdivMapping = 1;
@@ -145,7 +145,7 @@ BOOL CTerrain::Generate(int mosaic, int brickP2, float size, float vision, m_objRank = (int*)malloc(sizeof(int)*dim);
ZeroMemory(m_objRank, sizeof(int)*dim);
- return TRUE;
+ return true;
}
@@ -172,12 +172,12 @@ float CTerrain::RetScaleRelief() // Initializes the names of textures to use for the land.
-BOOL CTerrain::InitTextures(char* baseName, int* table, int dx, int dy)
+bool CTerrain::InitTextures(char* baseName, int* table, int dx, int dy)
{
int x, y;
char* p;
- m_bLevelText = FALSE;
+ m_bLevelText = false;
strcpy(m_texBaseName, baseName);
p = strchr(m_texBaseName, '.'); // p <- ^beginning of the extension
@@ -198,7 +198,7 @@ BOOL CTerrain::InitTextures(char* baseName, int* table, int dx, int dy) m_texture[x+y*m_mosaic] = table[(x%dx)+(y%dy)*dx];
}
}
- return TRUE;
+ return true;
}
@@ -214,14 +214,14 @@ void CTerrain::LevelFlush() // Initializes the names of textures to use for the land.
-BOOL CTerrain::LevelMaterial(int id, char* baseName, float u, float v,
+bool CTerrain::LevelMaterial(int id, char* baseName, float u, float v,
int up, int right, int down, int left,
float hardness)
{
int i;
i = m_levelMatTotal;
- if ( i >= MAXMATTERRAIN-1 ) return FALSE;
+ if ( i >= MAXMATTERRAIN-1 ) return false;
LevelOpenTable();
@@ -245,11 +245,11 @@ BOOL CTerrain::LevelMaterial(int id, char* baseName, float u, float v, if ( m_levelMatMax < down+1 ) m_levelMatMax = down+1;
if ( m_levelMatMax < left+1 ) m_levelMatMax = left+1;
- m_bLevelText = TRUE;
+ m_bLevelText = true;
m_subdivMapping = 4;
m_levelMatTotal ++;
- return TRUE;
+ return true;
}
@@ -265,13 +265,13 @@ BOOL CTerrain::LevelMaterial(int id, char* baseName, float u, float v, // Ix = (400+Wx)/5
// Iy = (400-Wz)/5
-BOOL CTerrain::ResFromBMP(const char* filename)
+bool CTerrain::ResFromBMP(const char* filename)
{
FILE* file;
int size, sizem;
file = fopen(filename, "rb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
size = (m_mosaic*m_brick)+1;
sizem = ((size+4-1)/4)*4; // upper size multiple of 4
@@ -290,11 +290,11 @@ BOOL CTerrain::ResFromBMP(const char* filename) free(m_resources);
m_resources = 0;
fclose(file);
- return FALSE;
+ return false;
}
fclose(file);
- return TRUE;
+ return true;
}
// Returns the resource type available underground.
@@ -349,8 +349,8 @@ void CTerrain::FlushRelief() // Ix = (400+Wx)/5
// Iy = (400-Wz)/5
-BOOL CTerrain::ReliefFromBMP(const char* filename, float scaleRelief,
- BOOL adjustBorder)
+bool CTerrain::ReliefFromBMP(const char* filename, float scaleRelief,
+ bool adjustBorder)
{
FILE* file;
unsigned char* buffer;
@@ -360,7 +360,7 @@ BOOL CTerrain::ReliefFromBMP(const char* filename, float scaleRelief, m_scaleRelief = scaleRelief;
file = fopen(filename, "rb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
size = (m_mosaic*m_brick)+1;
sizem = ((size+4-1)/4)*4; // upper size multiple of 4
@@ -373,7 +373,7 @@ BOOL CTerrain::ReliefFromBMP(const char* filename, float scaleRelief, {
free(buffer);
fclose(file);
- return FALSE;
+ return false;
}
limit = 0.9f;
@@ -400,12 +400,12 @@ BOOL CTerrain::ReliefFromBMP(const char* filename, float scaleRelief, free(buffer);
fclose(file);
- return TRUE;
+ return true;
}
// Adds a point of elevation in the buffer of relief.
-BOOL CTerrain::ReliefAddDot(D3DVECTOR pos, float scaleRelief)
+bool CTerrain::ReliefAddDot(D3DVECTOR pos, float scaleRelief)
{
float dim;
int size, x, y;
@@ -420,51 +420,51 @@ BOOL CTerrain::ReliefAddDot(D3DVECTOR pos, float scaleRelief) y = (int)pos.z;
if ( x < 0 || x >= size ||
- y < 0 || y >= size ) return FALSE;
+ y < 0 || y >= size ) return false;
if ( m_relief[x+y*size] < pos.y*scaleRelief )
{
m_relief[x+y*size] = pos.y*scaleRelief;
}
- return TRUE;
+ return true;
}
// Load relief from a DXF file.
-BOOL CTerrain::ReliefFromDXF(const char* filename, float scaleRelief)
+bool CTerrain::ReliefFromDXF(const char* filename, float scaleRelief)
{
FILE* file = NULL;
char line[100];
int command, rankSommet, nbSommet, nbFace, size;
D3DVECTOR* table;
- BOOL bWaitNbSommet;
- BOOL bWaitNbFace;
- BOOL bWaitSommetX;
- BOOL bWaitSommetY;
- BOOL bWaitSommetZ;
- BOOL bWaitFaceX;
- BOOL bWaitFaceY;
- BOOL bWaitFaceZ;
+ bool bWaitNbSommet;
+ bool bWaitNbFace;
+ bool bWaitSommetX;
+ bool bWaitSommetY;
+ bool bWaitSommetZ;
+ bool bWaitFaceX;
+ bool bWaitFaceY;
+ bool bWaitFaceZ;
float x,y,z;
int p1,p2,p3;
ZeroMemory(m_relief, sizeof(float)*(m_mosaic*m_brick+1)*(m_mosaic*m_brick+1));
file = fopen(filename, "r");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
size = (m_mosaic*m_brick)+1;
table = (D3DVECTOR*)malloc(sizeof(D3DVECTOR)*size*size);
rankSommet = 0;
- bWaitNbSommet = FALSE;
- bWaitNbFace = FALSE;
- bWaitSommetX = FALSE;
- bWaitSommetY = FALSE;
- bWaitSommetZ = FALSE;
- bWaitFaceX = FALSE;
- bWaitFaceY = FALSE;
- bWaitFaceZ = FALSE;
+ bWaitNbSommet = false;
+ bWaitNbFace = false;
+ bWaitSommetX = false;
+ bWaitSommetY = false;
+ bWaitSommetZ = false;
+ bWaitFaceX = false;
+ bWaitFaceY = false;
+ bWaitFaceZ = false;
while ( fgets(line, 100, file) != NULL )
{
@@ -473,42 +473,42 @@ BOOL CTerrain::ReliefFromDXF(const char* filename, float scaleRelief) if ( command == 66 )
{
- bWaitNbSommet = TRUE;
+ bWaitNbSommet = true;
}
if ( command == 71 && bWaitNbSommet )
{
- bWaitNbSommet = FALSE;
+ bWaitNbSommet = false;
sscanf(line, "%d", &nbSommet);
if ( nbSommet > size*size ) nbSommet = size*size;
rankSommet = 0;
- bWaitNbFace = TRUE;
+ bWaitNbFace = true;
}
if ( command == 72 && bWaitNbFace )
{
- bWaitNbFace = FALSE;
+ bWaitNbFace = false;
sscanf(line, "%d", &nbFace);
- bWaitSommetX = TRUE;
+ bWaitSommetX = true;
}
if ( command == 10 && bWaitSommetX )
{
- bWaitSommetX = FALSE;
+ bWaitSommetX = false;
sscanf(line, "%f", &x);
- bWaitSommetY = TRUE;
+ bWaitSommetY = true;
}
if ( command == 20 && bWaitSommetY )
{
- bWaitSommetY = FALSE;
+ bWaitSommetY = false;
sscanf(line, "%f", &y);
- bWaitSommetZ = TRUE;
+ bWaitSommetZ = true;
}
if ( command == 30 && bWaitSommetZ )
{
- bWaitSommetZ = FALSE;
+ bWaitSommetZ = false;
sscanf(line, "%f", &z);
nbSommet --;
@@ -516,33 +516,33 @@ BOOL CTerrain::ReliefFromDXF(const char* filename, float scaleRelief) {
D3DVECTOR p(x,z,y); // permutation of Y and Z!
table[rankSommet++] = p;
- bWaitSommetX = TRUE;
+ bWaitSommetX = true;
}
else
{
- bWaitFaceX = TRUE;
+ bWaitFaceX = true;
}
}
if ( command == 71 && bWaitFaceX )
{
- bWaitFaceX = FALSE;
+ bWaitFaceX = false;
sscanf(line, "%d", &p1);
if ( p1 < 0 ) p1 = -p1;
- bWaitFaceY = TRUE;
+ bWaitFaceY = true;
}
if ( command == 72 && bWaitFaceY )
{
- bWaitFaceY = FALSE;
+ bWaitFaceY = false;
sscanf(line, "%d", &p2);
if ( p2 < 0 ) p2 = -p2;
- bWaitFaceZ = TRUE;
+ bWaitFaceZ = true;
}
if ( command == 73 && bWaitFaceZ )
{
- bWaitFaceZ = FALSE;
+ bWaitFaceZ = false;
sscanf(line, "%d", &p3);
if ( p3 < 0 ) p3 = -p3;
@@ -552,7 +552,7 @@ BOOL CTerrain::ReliefFromDXF(const char* filename, float scaleRelief) ReliefAddDot(table[p3-1], scaleRelief);
ReliefAddDot(table[p2-1], scaleRelief);
ReliefAddDot(table[p1-1], scaleRelief);
- bWaitFaceX = TRUE;
+ bWaitFaceX = true;
}
}
@@ -560,7 +560,7 @@ BOOL CTerrain::ReliefFromDXF(const char* filename, float scaleRelief) free(table);
fclose(file);
- return TRUE;
+ return true;
}
@@ -759,7 +759,7 @@ D3DVERTEX2 CTerrain::RetVertex(int x, int y, int step) // |
// +-------------------> x
-BOOL CTerrain::CreateMosaic(int ox, int oy, int step, int objRank,
+bool CTerrain::CreateMosaic(int ox, int oy, int step, int objRank,
const D3DMATERIAL7 &mat,
float min, float max)
{
@@ -910,7 +910,7 @@ BOOL CTerrain::CreateMosaic(int ox, int oy, int step, int objRank, buffer->vertex[i++] = p1;
buffer->vertex[i++] = p2;
}
- m_engine->AddQuick(objRank, buffer, texName1, texName2, min, max, TRUE);
+ m_engine->AddQuick(objRank, buffer, texName1, texName2, min, max, true);
}
}
}
@@ -920,7 +920,7 @@ BOOL CTerrain::CreateMosaic(int ox, int oy, int step, int objRank, transform._43 = o.z;
m_engine->SetObjectTransform(objRank, transform);
- return TRUE;
+ return true;
}
// (*) There is 1 pixel cover around each of the 16 surfaces:
@@ -996,7 +996,7 @@ float CTerrain::LevelRetHeight(int x, int y) // Decide whether a point is using the materials.
-BOOL CTerrain::LevelGetDot(int x, int y, float min, float max, float slope)
+bool CTerrain::LevelGetDot(int x, int y, float min, float max, float slope)
{
float hc, h[4];
int i;
@@ -1008,11 +1008,11 @@ BOOL CTerrain::LevelGetDot(int x, int y, float min, float max, float slope) h[3] = LevelRetHeight(x-1, y+0);
if ( hc < min ||
- hc > max ) return FALSE;
+ hc > max ) return false;
if ( slope == 0.0f )
{
- return TRUE;
+ return true;
}
if ( slope > 0.0f )
@@ -1021,10 +1021,10 @@ BOOL CTerrain::LevelGetDot(int x, int y, float min, float max, float slope) {
if ( Abs(hc-h[i]) >= slope )
{
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
if ( slope < 0.0f )
@@ -1033,13 +1033,13 @@ BOOL CTerrain::LevelGetDot(int x, int y, float min, float max, float slope) {
if ( Abs(hc-h[i]) < -slope )
{
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// Seeks if material exists.
@@ -1156,7 +1156,7 @@ void CTerrain::LevelSetDot(int x, int y, int id, char *mat) // Tests if a material can give a place, according to its four neighbors.
// If yes, puts the point.
-BOOL CTerrain::LevelIfDot(int x, int y, int id, char *mat)
+bool CTerrain::LevelIfDot(int x, int y, int id, char *mat)
{
char test[4];
@@ -1169,7 +1169,7 @@ BOOL CTerrain::LevelIfDot(int x, int y, int id, char *mat) test[2] = m_levelDot[(x+0)+(y-1)*m_levelDotSize].mat[2];
test[3] = m_levelDot[(x+0)+(y-1)*m_levelDotSize].mat[3];
- if ( LevelTestMat(test) == -1 ) return FALSE;
+ if ( LevelTestMat(test) == -1 ) return false;
}
// Compatible with left neighbor?
@@ -1181,7 +1181,7 @@ BOOL CTerrain::LevelIfDot(int x, int y, int id, char *mat) test[2] = m_levelDot[(x-1)+(y+0)*m_levelDotSize].mat[2];
test[3] = m_levelDot[(x-1)+(y+0)*m_levelDotSize].mat[3];
- if ( LevelTestMat(test) == -1 ) return FALSE;
+ if ( LevelTestMat(test) == -1 ) return false;
}
// Compatible with upper neighbor?
@@ -1193,7 +1193,7 @@ BOOL CTerrain::LevelIfDot(int x, int y, int id, char *mat) test[2] = mat[0];
test[3] = m_levelDot[(x+0)+(y+1)*m_levelDotSize].mat[3];
- if ( LevelTestMat(test) == -1 ) return FALSE;
+ if ( LevelTestMat(test) == -1 ) return false;
}
// Compatible with right neighbor?
@@ -1205,16 +1205,16 @@ BOOL CTerrain::LevelIfDot(int x, int y, int id, char *mat) test[2] = m_levelDot[(x+1)+(y+0)*m_levelDotSize].mat[2];
test[3] = mat[1];
- if ( LevelTestMat(test) == -1 ) return FALSE;
+ if ( LevelTestMat(test) == -1 ) return false;
}
LevelSetDot(x, y, id, mat); // puts the point
- return TRUE;
+ return true;
}
// Modifies the state of a point.
-BOOL CTerrain::LevelPutDot(int x, int y, int id)
+bool CTerrain::LevelPutDot(int x, int y, int id)
{
TerrainMaterial *tm;
char mat[4];
@@ -1224,13 +1224,13 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) y /= m_brick/m_subdivMapping;
if ( x < 0 || x >= m_levelDotSize ||
- y < 0 || y >= m_levelDotSize ) return FALSE;
+ y < 0 || y >= m_levelDotSize ) return false;
tm = LevelSearchMat(id);
- if ( tm == 0 ) return FALSE;
+ if ( tm == 0 ) return false;
// Tries without changing neighbors.
- if ( LevelIfDot(x, y, id, tm->mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, tm->mat) ) return true;
// Tries changing a single neighbor (4x).
for ( up=0 ; up<m_levelMatMax ; up++ )
@@ -1240,7 +1240,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = tm->mat[2];
mat[3] = tm->mat[3];
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
for ( right=0 ; right<m_levelMatMax ; right++ )
@@ -1250,7 +1250,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = tm->mat[2];
mat[3] = tm->mat[3];
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
for ( down=0 ; down<m_levelMatMax ; down++ )
@@ -1260,7 +1260,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = down;
mat[3] = tm->mat[3];
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
for ( left=0 ; left<m_levelMatMax ; left++ )
@@ -1270,7 +1270,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = tm->mat[2];
mat[3] = left;
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
// Tries changing two neighbors (6x).
@@ -1283,7 +1283,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = down;
mat[3] = tm->mat[3];
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
}
@@ -1296,7 +1296,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = tm->mat[2];
mat[3] = left;
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
}
@@ -1309,7 +1309,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = tm->mat[2];
mat[3] = tm->mat[3];
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
}
@@ -1322,7 +1322,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = down;
mat[3] = tm->mat[3];
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
}
@@ -1335,7 +1335,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = down;
mat[3] = left;
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
}
@@ -1348,7 +1348,7 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = tm->mat[2];
mat[3] = left;
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
}
@@ -1366,25 +1366,25 @@ BOOL CTerrain::LevelPutDot(int x, int y, int id) mat[2] = down;
mat[3] = left;
- if ( LevelIfDot(x, y, id, mat) ) return TRUE;
+ if ( LevelIfDot(x, y, id, mat) ) return true;
}
}
}
}
OutputDebugString("LevelPutDot error\n");
- return FALSE;
+ return false;
}
// Initializes all the ground with a material.
-BOOL CTerrain::LevelInit(int id)
+bool CTerrain::LevelInit(int id)
{
TerrainMaterial* tm;
int i, j;
tm = LevelSearchMat(id);
- if ( tm == 0 ) return FALSE;
+ if ( tm == 0 ) return false;
for ( i=0 ; i<m_levelDotSize*m_levelDotSize ; i++ )
{
@@ -1396,12 +1396,12 @@ BOOL CTerrain::LevelInit(int id) }
}
- return TRUE;
+ return true;
}
// Generates a level in the terrain.
-BOOL CTerrain::LevelGenerate(int *id, float min, float max,
+bool CTerrain::LevelGenerate(int *id, float min, float max,
float slope, float freq,
D3DVECTOR center, float radius)
{
@@ -1428,7 +1428,7 @@ BOOL CTerrain::LevelGenerate(int *id, float min, float max, while ( id[i] != 0 )
{
tm = LevelSearchMat(id[i++]);
- if ( tm == 0 ) return FALSE;
+ if ( tm == 0 ) return false;
}
numID = i;
@@ -1483,7 +1483,7 @@ BOOL CTerrain::LevelGenerate(int *id, float min, float max, }
}
- return TRUE;
+ return true;
}
// Initializes an table with empty levels.
@@ -1519,7 +1519,7 @@ void CTerrain::LevelCloseTable() // Creates all objects in a mesh square ground.
-BOOL CTerrain::CreateSquare(BOOL bMultiRes, int x, int y)
+bool CTerrain::CreateSquare(bool bMultiRes, int x, int y)
{
D3DMATERIAL7 mat;
float min, max;
@@ -1556,12 +1556,12 @@ BOOL CTerrain::CreateSquare(BOOL bMultiRes, int x, int y) CreateMosaic(x, y, 1, objRank, mat, 0.0f, g_HUGE);
}
- return TRUE;
+ return true;
}
// Creates all objects of the terrain within the 3D engine.
-BOOL CTerrain::CreateObjects(BOOL bMultiRes)
+bool CTerrain::CreateObjects(bool bMultiRes)
{
int x, y;
@@ -1575,14 +1575,14 @@ BOOL CTerrain::CreateObjects(BOOL bMultiRes) }
}
- return TRUE;
+ return true;
}
// Modifies the terrain's relief.
// ATTENTION: ok only with m_depth = 2!
-BOOL CTerrain::Terraform(const D3DVECTOR &p1, const D3DVECTOR &p2, float height)
+bool CTerrain::Terraform(const D3DVECTOR &p1, const D3DVECTOR &p2, float height)
{
POINT tp1, tp2, pp1, pp2;
float dim, avg;
@@ -1665,7 +1665,7 @@ BOOL CTerrain::Terraform(const D3DVECTOR &p1, const D3DVECTOR &p2, float height) }
m_engine->Update();
- return TRUE;
+ return true;
}
@@ -1722,7 +1722,7 @@ float CTerrain::RetCoarseSlope(const D3DVECTOR &pos) // Gives the normal vector at the position p (x,-,z) of the ground.
-BOOL CTerrain::GetNormal(D3DVECTOR &n, const D3DVECTOR &p)
+bool CTerrain::GetNormal(D3DVECTOR &n, const D3DVECTOR &p)
{
D3DVECTOR p1, p2, p3, p4;
float dim;
@@ -1734,7 +1734,7 @@ BOOL CTerrain::GetNormal(D3DVECTOR &n, const D3DVECTOR &p) y = (int)((p.z+dim)/m_size);
if ( x < 0 || x > m_mosaic*m_brick ||
- y < 0 || y > m_mosaic*m_brick ) return FALSE;
+ y < 0 || y > m_mosaic*m_brick ) return false;
p1 = RetVector(x+0, y+0);
p2 = RetVector(x+1, y+0);
@@ -1749,12 +1749,12 @@ BOOL CTerrain::GetNormal(D3DVECTOR &n, const D3DVECTOR &p) {
n = ComputeNormal(p2,p4,p3);
}
- return TRUE;
+ return true;
}
// Returns the height of the ground.
-float CTerrain::RetFloorLevel(const D3DVECTOR &p, BOOL bBrut, BOOL bWater)
+float CTerrain::RetFloorLevel(const D3DVECTOR &p, bool bBrut, bool bWater)
{
D3DVECTOR p1, p2, p3, p4, ps;
float dim, level;
@@ -1766,7 +1766,7 @@ float CTerrain::RetFloorLevel(const D3DVECTOR &p, BOOL bBrut, BOOL bWater) y = (int)((p.z+dim)/m_size);
if ( x < 0 || x > m_mosaic*m_brick ||
- y < 0 || y > m_mosaic*m_brick ) return FALSE;
+ y < 0 || y > m_mosaic*m_brick ) return false;
p1 = RetVector(x+0, y+0);
p2 = RetVector(x+1, y+0);
@@ -1797,7 +1797,7 @@ float CTerrain::RetFloorLevel(const D3DVECTOR &p, BOOL bBrut, BOOL bWater) // Returns the height to the ground.
// This height is positive when you are above the ground.
-float CTerrain::RetFloorHeight(const D3DVECTOR &p, BOOL bBrut, BOOL bWater)
+float CTerrain::RetFloorHeight(const D3DVECTOR &p, bool bBrut, bool bWater)
{
D3DVECTOR p1, p2, p3, p4, ps;
float dim, level;
@@ -1809,7 +1809,7 @@ float CTerrain::RetFloorHeight(const D3DVECTOR &p, BOOL bBrut, BOOL bWater) y = (int)((p.z+dim)/m_size);
if ( x < 0 || x > m_mosaic*m_brick ||
- y < 0 || y > m_mosaic*m_brick ) return FALSE;
+ y < 0 || y > m_mosaic*m_brick ) return false;
p1 = RetVector(x+0, y+0);
p2 = RetVector(x+1, y+0);
@@ -1839,7 +1839,7 @@ float CTerrain::RetFloorHeight(const D3DVECTOR &p, BOOL bBrut, BOOL bWater) // Modifies the coordinate "y" of point "p" to rest on the ground floor.
-BOOL CTerrain::MoveOnFloor(D3DVECTOR &p, BOOL bBrut, BOOL bWater)
+bool CTerrain::MoveOnFloor(D3DVECTOR &p, bool bBrut, bool bWater)
{
D3DVECTOR p1, p2, p3, p4;
float dim, level;
@@ -1851,7 +1851,7 @@ BOOL CTerrain::MoveOnFloor(D3DVECTOR &p, BOOL bBrut, BOOL bWater) y = (int)((p.z+dim)/m_size);
if ( x < 0 || x > m_mosaic*m_brick ||
- y < 0 || y > m_mosaic*m_brick ) return FALSE;
+ y < 0 || y > m_mosaic*m_brick ) return false;
p1 = RetVector(x+0, y+0);
p2 = RetVector(x+1, y+0);
@@ -1860,11 +1860,11 @@ BOOL CTerrain::MoveOnFloor(D3DVECTOR &p, BOOL bBrut, BOOL bWater) if ( Abs(p.z-p2.z) < Abs(p.x-p2.x) )
{
- if ( !IntersectY(p1, p2, p3, p) ) return FALSE;
+ if ( !IntersectY(p1, p2, p3, p) ) return false;
}
else
{
- if ( !IntersectY(p2, p4, p3, p) ) return FALSE;
+ if ( !IntersectY(p2, p4, p3, p) ) return false;
}
if ( !bBrut ) AdjustBuildingLevel(p);
@@ -1875,15 +1875,15 @@ BOOL CTerrain::MoveOnFloor(D3DVECTOR &p, BOOL bBrut, BOOL bWater) if ( p.y < level ) p.y = level; // not under water
}
- return TRUE;
+ return true;
}
// Modifies a coordinate so that it is on the ground.
-// Returns FALSE if the initial coordinate was too far.
+// Returns false if the initial coordinate was too far.
-BOOL CTerrain::ValidPosition(D3DVECTOR &p, float marging)
+bool CTerrain::ValidPosition(D3DVECTOR &p, float marging)
{
- BOOL bOK = TRUE;
+ bool bOK = true;
float limit;
limit = m_mosaic*m_brick*m_size/2.0f - marging;
@@ -1891,25 +1891,25 @@ BOOL CTerrain::ValidPosition(D3DVECTOR &p, float marging) if ( p.x < -limit )
{
p.x = -limit;
- bOK = FALSE;
+ bOK = false;
}
if ( p.z < -limit )
{
p.z = -limit;
- bOK = FALSE;
+ bOK = false;
}
if ( p.x > limit )
{
p.x = limit;
- bOK = FALSE;
+ bOK = false;
}
if ( p.z > limit )
{
p.z = limit;
- bOK = FALSE;
+ bOK = false;
}
return bOK;
@@ -1926,7 +1926,7 @@ void CTerrain::FlushBuildingLevel() // Adds a new elevation for a building.
-BOOL CTerrain::AddBuildingLevel(D3DVECTOR center, float min, float max,
+bool CTerrain::AddBuildingLevel(D3DVECTOR center, float min, float max,
float height, float factor)
{
int i;
@@ -1940,14 +1940,14 @@ BOOL CTerrain::AddBuildingLevel(D3DVECTOR center, float min, float max, }
}
- if ( m_buildingUsed >= MAXBUILDINGLEVEL ) return FALSE;
+ if ( m_buildingUsed >= MAXBUILDINGLEVEL ) return false;
i = m_buildingUsed++;
update:
m_buildingTable[i].center = center;
m_buildingTable[i].min = min;
m_buildingTable[i].max = max;
- m_buildingTable[i].level = RetFloorLevel(center, TRUE);
+ m_buildingTable[i].level = RetFloorLevel(center, true);
m_buildingTable[i].height = height;
m_buildingTable[i].factor = factor;
m_buildingTable[i].bboxMinX = center.x-max;
@@ -1955,12 +1955,12 @@ BOOL CTerrain::AddBuildingLevel(D3DVECTOR center, float min, float max, m_buildingTable[i].bboxMinZ = center.z-max;
m_buildingTable[i].bboxMaxZ = center.z+max;
- return TRUE;
+ return true;
}
// Updates the elevation for a building when it was moved up (after a terraforming).
-BOOL CTerrain::UpdateBuildingLevel(D3DVECTOR center)
+bool CTerrain::UpdateBuildingLevel(D3DVECTOR center)
{
int i;
@@ -1970,16 +1970,16 @@ BOOL CTerrain::UpdateBuildingLevel(D3DVECTOR center) center.z == m_buildingTable[i].center.z )
{
m_buildingTable[i].center = center;
- m_buildingTable[i].level = RetFloorLevel(center, TRUE);
- return TRUE;
+ m_buildingTable[i].level = RetFloorLevel(center, true);
+ return true;
}
}
- return FALSE;
+ return false;
}
// Removes the elevation for a building when it was destroyed.
-BOOL CTerrain::DeleteBuildingLevel(D3DVECTOR center)
+bool CTerrain::DeleteBuildingLevel(D3DVECTOR center)
{
int i, j;
@@ -1993,10 +1993,10 @@ BOOL CTerrain::DeleteBuildingLevel(D3DVECTOR center) m_buildingTable[j-1] = m_buildingTable[j];
}
m_buildingUsed --;
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
// Returns the influence factor whether a position is on a possible rise.
@@ -2054,7 +2054,7 @@ void CTerrain::AdjustBuildingLevel(D3DVECTOR &p) (m_buildingTable[i].max-m_buildingTable[i].min)*
m_buildingTable[i].height;
- base = RetFloorLevel(p, TRUE);
+ base = RetFloorLevel(p, true);
if ( p.y < base ) p.y = base;
#else
border.x = ((p.x-m_buildingTable[i].center.x)*m_buildingTable[i].max)/
@@ -2062,7 +2062,7 @@ void CTerrain::AdjustBuildingLevel(D3DVECTOR &p) border.z = ((p.z-m_buildingTable[i].center.z)*m_buildingTable[i].max)/
dist+m_buildingTable[i].center.z;
- base = RetFloorLevel(border, TRUE);
+ base = RetFloorLevel(border, true);
p.y = (m_buildingTable[i].max-dist)/
(m_buildingTable[i].max-m_buildingTable[i].min)*
@@ -2164,7 +2164,7 @@ float CTerrain::RetFlatZoneRadius(D3DVECTOR center, float max) angle = RetFineSlope(center);
if ( angle >= FLATLIMIT ) return 0.0f;
- ref = RetFloorLevel(center, TRUE);
+ ref = RetFloorLevel(center, true);
radius = 1.0f;
while ( radius <= max )
@@ -2181,7 +2181,7 @@ float CTerrain::RetFlatZoneRadius(D3DVECTOR center, float max) p = RotatePoint(c, angle, p);
pos.x = p.x;
pos.z = p.y;
- h = RetFloorLevel(pos, TRUE);
+ h = RetFloorLevel(pos, true);
if ( Abs(h-ref) > 1.0f ) return radius;
angle += PI*2.0f/8.0f;
@@ -2218,13 +2218,13 @@ void CTerrain::FlushFlyingLimit() // Empty the limits table of flight.
-BOOL CTerrain::AddFlyingLimit(D3DVECTOR center,
+bool CTerrain::AddFlyingLimit(D3DVECTOR center,
float extRadius, float intRadius,
float maxHeight)
{
int i;
- if ( m_flyingLimitTotal >= MAXFLYINGLIMIT ) return FALSE;
+ if ( m_flyingLimitTotal >= MAXFLYINGLIMIT ) return false;
i = m_flyingLimitTotal;
m_flyingLimit[i].center = center;
@@ -2233,12 +2233,12 @@ BOOL CTerrain::AddFlyingLimit(D3DVECTOR center, m_flyingLimit[i].maxHeight = maxHeight;
m_flyingLimitTotal = i+1;
- return TRUE;
+ return true;
}
// Returns the maximum height of flight.
-float CTerrain::RetFlyingLimit(D3DVECTOR pos, BOOL bNoLimit)
+float CTerrain::RetFlyingLimit(D3DVECTOR pos, bool bNoLimit)
{
float dist, h;
int i;
diff --git a/src/graphics/common/terrain.h b/src/graphics/common/terrain.h index fcc10e8..50f5612 100644 --- a/src/graphics/common/terrain.h +++ b/src/graphics/common/terrain.h @@ -101,36 +101,36 @@ public: CTerrain(CInstanceManager* iMan);
~CTerrain();
- BOOL Generate(int mosaic, int brickP2, float size, float vision, int depth, float hardness);
- BOOL InitTextures(char* baseName, int* table, int dx, int dy);
+ bool Generate(int mosaic, int brickP2, float size, float vision, int depth, float hardness);
+ bool InitTextures(char* baseName, int* table, int dx, int dy);
void LevelFlush();
- BOOL LevelMaterial(int id, char* baseName, float u, float v, int up, int right, int down, int left, float hardness);
- BOOL LevelInit(int id);
- BOOL LevelGenerate(int *id, float min, float max, float slope, float freq, D3DVECTOR center, float radius);
+ bool LevelMaterial(int id, char* baseName, float u, float v, int up, int right, int down, int left, float hardness);
+ bool LevelInit(int id);
+ bool LevelGenerate(int *id, float min, float max, float slope, float freq, D3DVECTOR center, float radius);
void FlushRelief();
- BOOL ReliefFromBMP(const char* filename, float scaleRelief, BOOL adjustBorder);
- BOOL ReliefFromDXF(const char* filename, float scaleRelief);
- BOOL ResFromBMP(const char* filename);
- BOOL CreateObjects(BOOL bMultiRes);
- BOOL Terraform(const D3DVECTOR &p1, const D3DVECTOR &p2, float height);
+ bool ReliefFromBMP(const char* filename, float scaleRelief, bool adjustBorder);
+ bool ReliefFromDXF(const char* filename, float scaleRelief);
+ bool ResFromBMP(const char* filename);
+ bool CreateObjects(bool bMultiRes);
+ bool Terraform(const D3DVECTOR &p1, const D3DVECTOR &p2, float height);
void SetWind(D3DVECTOR speed);
D3DVECTOR RetWind();
float RetFineSlope(const D3DVECTOR &pos);
float RetCoarseSlope(const D3DVECTOR &pos);
- BOOL GetNormal(D3DVECTOR &n, const D3DVECTOR &p);
- float RetFloorLevel(const D3DVECTOR &p, BOOL bBrut=FALSE, BOOL bWater=FALSE);
- float RetFloorHeight(const D3DVECTOR &p, BOOL bBrut=FALSE, BOOL bWater=FALSE);
- BOOL MoveOnFloor(D3DVECTOR &p, BOOL bBrut=FALSE, BOOL bWater=FALSE);
- BOOL ValidPosition(D3DVECTOR &p, float marging);
+ bool GetNormal(D3DVECTOR &n, const D3DVECTOR &p);
+ float RetFloorLevel(const D3DVECTOR &p, bool bBrut=false, bool bWater=false);
+ float RetFloorHeight(const D3DVECTOR &p, bool bBrut=false, bool bWater=false);
+ bool MoveOnFloor(D3DVECTOR &p, bool bBrut=false, bool bWater=false);
+ bool ValidPosition(D3DVECTOR &p, float marging);
TerrainRes RetResource(const D3DVECTOR &p);
void LimitPos(D3DVECTOR &pos);
void FlushBuildingLevel();
- BOOL AddBuildingLevel(D3DVECTOR center, float min, float max, float height, float factor);
- BOOL UpdateBuildingLevel(D3DVECTOR center);
- BOOL DeleteBuildingLevel(D3DVECTOR center);
+ bool AddBuildingLevel(D3DVECTOR center, float min, float max, float height, float factor);
+ bool UpdateBuildingLevel(D3DVECTOR center);
+ bool DeleteBuildingLevel(D3DVECTOR center);
float RetBuildingFactor(const D3DVECTOR &p);
float RetHardness(const D3DVECTOR &p);
@@ -145,25 +145,25 @@ public: void SetFlyingMaxHeight(float height);
float RetFlyingMaxHeight();
void FlushFlyingLimit();
- BOOL AddFlyingLimit(D3DVECTOR center, float extRadius, float intRadius, float maxHeight);
- float RetFlyingLimit(D3DVECTOR pos, BOOL bNoLimit);
+ bool AddFlyingLimit(D3DVECTOR center, float extRadius, float intRadius, float maxHeight);
+ float RetFlyingLimit(D3DVECTOR pos, bool bNoLimit);
protected:
- BOOL ReliefAddDot(D3DVECTOR pos, float scaleRelief);
+ bool ReliefAddDot(D3DVECTOR pos, float scaleRelief);
void AdjustRelief();
D3DVECTOR RetVector(int x, int y);
D3DVERTEX2 RetVertex(int x, int y, int step);
- BOOL CreateMosaic(int ox, int oy, int step, int objRank, const D3DMATERIAL7 &mat, float min, float max);
- BOOL CreateSquare(BOOL bMultiRes, int x, int y);
+ bool CreateMosaic(int ox, int oy, int step, int objRank, const D3DMATERIAL7 &mat, float min, float max);
+ bool CreateSquare(bool bMultiRes, int x, int y);
TerrainMaterial* LevelSearchMat(int id);
void LevelTextureName(int x, int y, char *name, FPOINT &uv);
float LevelRetHeight(int x, int y);
- BOOL LevelGetDot(int x, int y, float min, float max, float slope);
+ bool LevelGetDot(int x, int y, float min, float max, float slope);
int LevelTestMat(char *mat);
void LevelSetDot(int x, int y, int id, char *mat);
- BOOL LevelIfDot(int x, int y, int id, char *mat);
- BOOL LevelPutDot(int x, int y, int id);
+ bool LevelIfDot(int x, int y, int id, char *mat);
+ bool LevelPutDot(int x, int y, int id);
void LevelOpenTable();
void LevelCloseTable();
@@ -181,8 +181,8 @@ protected: float* m_relief; // table of the relief
int* m_texture; // table of textures
int* m_objRank; // table of rows of objects
- BOOL m_bMultiText;
- BOOL m_bLevelText;
+ bool m_bMultiText;
+ bool m_bLevelText;
float m_scaleMapping; // scale of the mapping
float m_scaleRelief;
int m_subdivMapping;
diff --git a/src/graphics/common/water.cpp b/src/graphics/common/water.cpp index 5e7e21f..9ea01df 100644 --- a/src/graphics/common/water.cpp +++ b/src/graphics/common/water.cpp @@ -55,8 +55,8 @@ CWater::CWater(CInstanceManager* iMan, CD3DEngine* engine) m_type[0] = WATER_NULL;
m_type[1] = WATER_NULL;
m_level = 0.0f;
- m_bDraw = TRUE;
- m_bLava = FALSE;
+ m_bDraw = true;
+ m_bLava = false;
m_color = 0xffffffff;
m_subdiv = 4;
m_filename[0] = 0;
@@ -69,7 +69,7 @@ CWater::~CWater() }
-BOOL CWater::EventProcess(const Event &event)
+bool CWater::EventProcess(const Event &event)
{
if ( event.event == EVENT_FRAME )
{
@@ -148,24 +148,24 @@ BOOL CWater::EventProcess(const Event &event) }
#endif
}
- return TRUE;
+ return true;
}
// Makes water evolve.
-BOOL CWater::EventFrame(const Event &event)
+bool CWater::EventFrame(const Event &event)
{
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
m_time += event.rTime;
- if ( m_type[0] == WATER_NULL ) return TRUE;
+ if ( m_type[0] == WATER_NULL ) return true;
if ( m_bLava )
{
LavaFrame(event.rTime);
}
- return TRUE;
+ return true;
}
// Makes evolve the steam jets on the lava.
@@ -202,7 +202,7 @@ void CWater::LavaFrame(float rTime) perp.z = dir.x;
pos = pos + perp*shift;
- level = m_terrain->RetFloorLevel(pos, TRUE);
+ level = m_terrain->RetFloorLevel(pos, true);
if ( level < m_level )
{
pos.y = m_level;
@@ -241,13 +241,13 @@ void CWater::VaporFlush() for ( i=0 ; i<MAXWATVAPOR ; i++ )
{
- m_vapor[i].bUsed = FALSE;
+ m_vapor[i].bUsed = false;
}
}
// Creates a new steam.
-BOOL CWater::VaporCreate(ParticuleType type, D3DVECTOR pos, float delay)
+bool CWater::VaporCreate(ParticuleType type, D3DVECTOR pos, float delay)
{
int i;
@@ -255,7 +255,7 @@ BOOL CWater::VaporCreate(ParticuleType type, D3DVECTOR pos, float delay) {
if ( !m_vapor[i].bUsed )
{
- m_vapor[i].bUsed = TRUE;
+ m_vapor[i].bUsed = true;
m_vapor[i].type = type;
m_vapor[i].pos = pos;
m_vapor[i].delay = delay;
@@ -275,10 +275,10 @@ BOOL CWater::VaporCreate(ParticuleType type, D3DVECTOR pos, float delay) m_sound->Play(SOUND_PSHHH, pos, 0.3f, 2.0f);
}
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
// Makes evolve a steam jet,
@@ -348,7 +348,7 @@ void CWater::VaporFrame(int i, float rTime) }
else
{
- m_vapor[i].bUsed = FALSE;
+ m_vapor[i].bUsed = false;
}
}
@@ -426,9 +426,9 @@ void CWater::DrawBack() m_engine->SetTexture("", 0);
device = m_engine->RetD3DDevice();
- device->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE);
- device->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE);
- device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+ device->SetRenderState(D3DRENDERSTATE_LIGHTING, false);
+ device->SetRenderState(D3DRENDERSTATE_ZENABLE, false);
+ device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
m_engine->SetState(D3DSTATENORMAL);
deep = m_engine->RetDeepView(0);
@@ -472,9 +472,9 @@ void CWater::DrawBack() m_engine->SetFocus(m_engine->RetFocus());
m_engine->UpdateMatProj(); // gives the initial depth of view
- device->SetRenderState(D3DRENDERSTATE_LIGHTING, TRUE);
- device->SetRenderState(D3DRENDERSTATE_ZENABLE, TRUE);
- device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+ device->SetRenderState(D3DRENDERSTATE_LIGHTING, true);
+ device->SetRenderState(D3DRENDERSTATE_ZENABLE, true);
+ device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
}
// Draws the flat surface of the water.
@@ -487,7 +487,7 @@ void CWater::DrawSurf() D3DMATRIX matrix;
D3DVECTOR eye, lookat, n, pos, p;
FPOINT uv1, uv2;
- BOOL bUnder;
+ bool bUnder;
DWORD flags;
float deep, size, sizez, radius;
int rankview, i, j, u;
@@ -506,9 +506,9 @@ void CWater::DrawSurf() device = m_engine->RetD3DDevice();
//? device->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
-//? device->SetRenderState(D3DRENDERSTATE_LIGHTING, TRUE);
-//? device->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE);
- device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+//? device->SetRenderState(D3DRENDERSTATE_LIGHTING, true);
+//? device->SetRenderState(D3DRENDERSTATE_ZENABLE, false);
+ device->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
D3DUtil_SetIdentityMatrix(matrix);
device->SetTransform(D3DTRANSFORMSTATE_WORLD, &matrix);
@@ -537,7 +537,7 @@ void CWater::DrawSurf() {
m_engine->SetState(D3DSTATENORMAL);
}
- device->SetRenderState(D3DRENDERSTATE_FOGENABLE, TRUE);
+ device->SetRenderState(D3DRENDERSTATE_FOGENABLE, true);
size = m_size/2.0f;
if ( bUnder ) sizez = -size;
@@ -604,7 +604,7 @@ void CWater::DrawSurf() // Indicates if there is water in a given position.
-BOOL CWater::RetWater(int x, int y)
+bool CWater::RetWater(int x, int y)
{
D3DVECTOR pos;
float size, offset, level;
@@ -623,16 +623,16 @@ BOOL CWater::RetWater(int x, int y) pos.x = (x+dx)*size - offset;
pos.z = (y+dy)*size - offset;
pos.y = 0.0f;
- level = m_terrain->RetFloorLevel(pos, TRUE);
- if ( level < m_level+m_eddy.y ) return TRUE;
+ level = m_terrain->RetFloorLevel(pos, true);
+ if ( level < m_level+m_eddy.y ) return true;
}
}
- return FALSE;
+ return false;
}
// Updates the positions, relative to the ground.
-BOOL CWater::CreateLine(int x, int y, int len)
+bool CWater::CreateLine(int x, int y, int len)
{
float offset;
@@ -653,7 +653,7 @@ BOOL CWater::CreateLine(int x, int y, int len) // Creates all expanses of water.
-BOOL CWater::Create(WaterType type1, WaterType type2, const char *filename,
+bool CWater::Create(WaterType type1, WaterType type2, const char *filename,
D3DCOLORVALUE diffuse, D3DCOLORVALUE ambient,
float level, float glint, D3DVECTOR eddy)
{
@@ -688,7 +688,7 @@ BOOL CWater::Create(WaterType type1, WaterType type2, const char *filename, m_brick /= m_subdiv;
m_size *= m_subdiv;
- if ( m_type[0] == WATER_NULL ) return TRUE;
+ if ( m_type[0] == WATER_NULL ) return true;
m_lineUsed = 0;
for ( y=0 ; y<m_brick ; y++ )
@@ -701,7 +701,7 @@ BOOL CWater::Create(WaterType type1, WaterType type2, const char *filename, len ++;
if ( len >= 5 )
{
- if ( !CreateLine(x-len+1, y, len) ) return FALSE;
+ if ( !CreateLine(x-len+1, y, len) ) return false;
len = 0;
}
}
@@ -709,17 +709,17 @@ BOOL CWater::Create(WaterType type1, WaterType type2, const char *filename, {
if ( len != 0 )
{
- if ( !CreateLine(x-len, y, len) ) return FALSE;
+ if ( !CreateLine(x-len, y, len) ) return false;
len = 0;
}
}
}
if ( len != 0 )
{
- if ( !CreateLine(x-len, y, len) ) return FALSE;
+ if ( !CreateLine(x-len, y, len) ) return false;
}
}
- return TRUE;
+ return true;
}
// Removes all the water.
@@ -729,13 +729,13 @@ void CWater::Flush() m_type[0] = WATER_NULL;
m_type[1] = WATER_NULL;
m_level = 0.0f;
- m_bLava = FALSE;
+ m_bLava = false;
}
// Changes the level of the water.
-BOOL CWater::SetLevel(float level)
+bool CWater::SetLevel(float level)
{
m_level = level;
@@ -801,12 +801,12 @@ float CWater::RetLevel(CObject* object) // Management of the mode of lava/water.
-void CWater::SetLava(BOOL bLava)
+void CWater::SetLava(bool bLava)
{
m_bLava = bLava;
}
-BOOL CWater::RetLava()
+bool CWater::RetLava()
{
return m_bLava;
}
diff --git a/src/graphics/common/water.h b/src/graphics/common/water.h index 959b12f..c0593a0 100644 --- a/src/graphics/common/water.h +++ b/src/graphics/common/water.h @@ -44,7 +44,7 @@ WaterLine; typedef struct
{
- BOOL bUsed;
+ bool bUsed;
ParticuleType type;
D3DVECTOR pos;
float delay;
@@ -71,30 +71,30 @@ public: ~CWater();
void SetD3DDevice(LPDIRECT3DDEVICE7 device);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Flush();
- BOOL Create(WaterType type1, WaterType type2, const char *filename, D3DCOLORVALUE diffuse, D3DCOLORVALUE ambient, float level, float glint, D3DVECTOR eddy);
+ bool Create(WaterType type1, WaterType type2, const char *filename, D3DCOLORVALUE diffuse, D3DCOLORVALUE ambient, float level, float glint, D3DVECTOR eddy);
void DrawBack();
void DrawSurf();
- BOOL SetLevel(float level);
+ bool SetLevel(float level);
float RetLevel();
float RetLevel(CObject* object);
- void SetLava(BOOL bLava);
- BOOL RetLava();
+ void SetLava(bool bLava);
+ bool RetLava();
void AdjustEye(D3DVECTOR &eye);
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
void LavaFrame(float rTime);
void AdjustLevel(D3DVECTOR &pos, D3DVECTOR &norm, FPOINT &uv1, FPOINT &uv2);
- BOOL RetWater(int x, int y);
- BOOL CreateLine(int x, int y, int len);
+ bool RetWater(int x, int y);
+ bool CreateLine(int x, int y, int len);
void VaporFlush();
- BOOL VaporCreate(ParticuleType type, D3DVECTOR pos, float delay);
+ bool VaporCreate(ParticuleType type, D3DVECTOR pos, float delay);
void VaporFrame(int i, float rTime);
protected:
@@ -124,8 +124,8 @@ protected: WaterVapor m_vapor[MAXWATVAPOR];
- BOOL m_bDraw;
- BOOL m_bLava;
+ bool m_bDraw;
+ bool m_bLava;
D3DCOLOR m_color;
};
diff --git a/src/graphics/d3d/d3dengine.cpp b/src/graphics/d3d/d3dengine.cpp index 12cf4ea..5b0dde0 100644 --- a/src/graphics/d3d/d3dengine.cpp +++ b/src/graphics/d3d/d3dengine.cpp @@ -135,13 +135,13 @@ CD3DEngine::CD3DEngine(CInstanceManager *iMan, CD3DApplication *app) m_waterAddColor.g = 0.0f;
m_waterAddColor.b = 0.0f;
m_waterAddColor.a = 0.0f;
- m_bPause = FALSE;
- m_bRender = TRUE;
- m_bMovieLock = FALSE;
- m_bShadow = TRUE;
- m_bGroundSpot = TRUE;
- m_bDirty = TRUE;
- m_bFog = TRUE;
+ m_bPause = false;
+ m_bRender = true;
+ m_bMovieLock = false;
+ m_bShadow = true;
+ m_bGroundSpot = true;
+ m_bDirty = true;
+ m_bFog = true;
m_speed = 1.0f;
m_secondTexNum = 0;
m_eyeDirH = 0.0f;
@@ -151,22 +151,22 @@ CD3DEngine::CD3DEngine(CInstanceManager *iMan, CD3DApplication *app) m_backgroundColorDown = 0;
m_backgroundCloudUp = 0;
m_backgroundCloudDown = 0;
- m_bBackgroundFull = FALSE;
- m_bBackgroundQuarter = FALSE;
- m_bOverFront = TRUE;
+ m_bBackgroundFull = false;
+ m_bBackgroundQuarter = false;
+ m_bOverFront = true;
m_overColor = 0;
m_overMode = D3DSTATETCb;
m_frontsizeName[0] = 0; // no front image
m_hiliteRank[0] = -1; // empty list
m_mousePos = FPOINT(0.5f, 0.5f);
m_mouseType = D3DMOUSENORM;
- m_bMouseHide = FALSE;
+ m_bMouseHide = false;
m_imageSurface = 0;
m_imageCopy = 0;
m_eyePt = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_lookatPt = D3DVECTOR(0.0f, 0.0f, 1.0f);
- m_bDrawWorld = TRUE;
- m_bDrawFront = FALSE;
+ m_bDrawWorld = true;
+ m_bDrawFront = false;
m_limitLOD[0] = 100.0f;
m_limitLOD[1] = 200.0f;
m_particuleDensity = 1.0f;
@@ -177,14 +177,14 @@ CD3DEngine::CD3DEngine(CInstanceManager *iMan, CD3DApplication *app) m_terrainVision = 1000.0f;
m_gadgetQuantity = 1.0f;
m_textureQuality = 1;
- m_bTotoMode = TRUE;
- m_bLensMode = TRUE;
- m_bWaterMode = TRUE;
- m_bSkyMode = TRUE;
- m_bBackForce = TRUE;
- m_bPlanetMode = TRUE;
- m_bLightMode = TRUE;
- m_bEditIndentMode = TRUE;
+ m_bTotoMode = true;
+ m_bLensMode = true;
+ m_bWaterMode = true;
+ m_bSkyMode = true;
+ m_bBackForce = true;
+ m_bPlanetMode = true;
+ m_bLightMode = true;
+ m_bEditIndentMode = true;
m_editIndentValue = 4;
m_tracePrecision = 1.0f;
@@ -196,13 +196,13 @@ CD3DEngine::CD3DEngine(CInstanceManager *iMan, CD3DApplication *app) if ( GetProfileInt("Engine", "StateColor", i) && i != -1 )
{
- m_bForceStateColor = TRUE;
+ m_bForceStateColor = true;
m_bStateColor = i;
}
else
{
- m_bForceStateColor = FALSE;
- m_bStateColor = FALSE;
+ m_bForceStateColor = false;
+ m_bStateColor = false;
}
m_blackSrcBlend[0] = 0;
@@ -223,7 +223,7 @@ CD3DEngine::CD3DEngine(CInstanceManager *iMan, CD3DApplication *app) if ( GetProfileInt("Engine", "AlphaSrcBlend", i) ) m_alphaSrcBlend[0] = i;
if ( GetProfileInt("Engine", "AlphaDestBlend", i) ) m_alphaDestBlend[0] = i;
- m_bUpdateGeometry = FALSE;
+ m_bUpdateGeometry = false;
for ( i=0 ; i<10 ; i++ )
{
@@ -318,11 +318,11 @@ void CD3DEngine::SetD3DDevice(LPDIRECT3DDEVICE7 device) m_pD3DDevice->GetCaps(&ddDesc);
if( ddDesc.dpcTriCaps.dwTextureBlendCaps & D3DPTBLENDCAPS_ADD )
{
- m_bStateColor = TRUE;
+ m_bStateColor = true;
}
else
{
- m_bStateColor = FALSE;
+ m_bStateColor = false;
}
}
@@ -373,7 +373,7 @@ void CD3DEngine::SetTerrain(CTerrain* terrain) // Saving the state of the graphics engine in COLOBOT.INI.
-BOOL CD3DEngine::WriteProfile()
+bool CD3DEngine::WriteProfile()
{
SetProfileInt("Engine", "AlphaMode", m_alphaMode);
@@ -395,7 +395,7 @@ BOOL CD3DEngine::WriteProfile() SetProfileInt("Engine", "AlphaSrcBlend", m_alphaSrcBlend[0]);
SetProfileInt("Engine", "AlphaDestBlend", m_alphaDestBlend[0]);
- return TRUE;
+ return true;
}
@@ -431,40 +431,40 @@ float CD3DEngine::TimeGet() }
-void CD3DEngine::SetPause(BOOL bPause)
+void CD3DEngine::SetPause(bool bPause)
{
m_bPause = bPause;
}
-BOOL CD3DEngine::RetPause()
+bool CD3DEngine::RetPause()
{
return m_bPause;
}
-void CD3DEngine::SetMovieLock(BOOL bLock)
+void CD3DEngine::SetMovieLock(bool bLock)
{
m_bMovieLock = bLock;
}
-BOOL CD3DEngine::RetMovieLock()
+bool CD3DEngine::RetMovieLock()
{
return m_bMovieLock;
}
-void CD3DEngine::SetShowStat(BOOL bShow)
+void CD3DEngine::SetShowStat(bool bShow)
{
m_app->SetShowStat(bShow);
}
-BOOL CD3DEngine::RetShowStat()
+bool CD3DEngine::RetShowStat()
{
return m_app->RetShowStat();
}
-void CD3DEngine::SetRenderEnable(BOOL bEnable)
+void CD3DEngine::SetRenderEnable(bool bEnable)
{
m_bRender = bEnable;
}
@@ -673,15 +673,15 @@ int CD3DEngine::CreateObject() for ( i=0 ; i<D3DMAXOBJECT ; i++ )
{
- if ( m_objectParam[i].bUsed == FALSE )
+ if ( m_objectParam[i].bUsed == false )
{
ZeroMemory(&m_objectParam[i], sizeof(D3DObject));
- m_objectParam[i].bUsed = TRUE;
+ m_objectParam[i].bUsed = true;
D3DUtil_SetIdentityMatrix(mat);
SetObjectTransform(i, mat);
- m_objectParam[i].bDrawWorld = TRUE;
+ m_objectParam[i].bDrawWorld = true;
m_objectParam[i].distance = 0.0f;
m_objectParam[i].bboxMin = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_objectParam[i].bboxMax = D3DVECTOR(0.0f, 0.0f, 0.0f);
@@ -747,7 +747,7 @@ void CD3DEngine::FlushObject() for ( i=0 ; i<D3DMAXOBJECT ; i++ )
{
- m_objectParam[i].bUsed = FALSE;
+ m_objectParam[i].bUsed = false;
}
m_objectParamTotal = 0;
@@ -759,7 +759,7 @@ void CD3DEngine::FlushObject() // Destroys an existing object.
-BOOL CD3DEngine::DeleteObject(int objRank)
+bool CD3DEngine::DeleteObject(int objRank)
{
D3DObjLevel1* p1;
D3DObjLevel2* p2;
@@ -804,7 +804,7 @@ BOOL CD3DEngine::DeleteObject(int objRank) ShadowDelete(objRank); // removes the shadow
- m_objectParam[objRank].bUsed = FALSE;
+ m_objectParam[objRank].bUsed = false;
m_objectParamTotal = 0;
for ( i=0 ; i<D3DMAXOBJECT ; i++ )
@@ -815,28 +815,28 @@ BOOL CD3DEngine::DeleteObject(int objRank) }
}
- return TRUE;
+ return true;
}
// Indicates whether an object should be drawn underneath the interface.
-BOOL CD3DEngine::SetDrawWorld(int objRank, BOOL bDraw)
+bool CD3DEngine::SetDrawWorld(int objRank, bool bDraw)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
m_objectParam[objRank].bDrawWorld = bDraw;
- return TRUE;
+ return true;
}
// Indicates whether an object should be drawn over the interface.
-BOOL CD3DEngine::SetDrawFront(int objRank, BOOL bDraw)
+bool CD3DEngine::SetDrawFront(int objRank, bool bDraw)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
m_objectParam[objRank].bDrawFront = bDraw;
- return TRUE;
+ return true;
}
@@ -990,10 +990,10 @@ D3DObjLevel6* CD3DEngine::AddLevel5(D3DObjLevel5 *&p5, D3DTypeTri type, // Adds one or more triangles to an existing object.
// The number must be divisible by 3.
-BOOL CD3DEngine::AddTriangle(int objRank, D3DVERTEX2* vertex, int nb,
+bool CD3DEngine::AddTriangle(int objRank, D3DVERTEX2* vertex, int nb,
const D3DMATERIAL7 &mat, int state,
char* texName1, char* texName2,
- float min, float max, BOOL bGlobalUpdate)
+ float min, float max, bool bGlobalUpdate)
{
D3DObjLevel2* p2;
D3DObjLevel3* p3;
@@ -1017,7 +1017,7 @@ BOOL CD3DEngine::AddTriangle(int objRank, D3DVERTEX2* vertex, int nb, if ( bGlobalUpdate )
{
- m_bUpdateGeometry = TRUE;
+ m_bUpdateGeometry = true;
}
else
{
@@ -1036,15 +1036,15 @@ BOOL CD3DEngine::AddTriangle(int objRank, D3DVERTEX2* vertex, int nb, }
m_objectParam[objRank].totalTriangle += nb/3;
- return TRUE;
+ return true;
}
// Adds a surface consisting of triangles joined.
-BOOL CD3DEngine::AddSurface(int objRank, D3DVERTEX2* vertex, int nb,
+bool CD3DEngine::AddSurface(int objRank, D3DVERTEX2* vertex, int nb,
const D3DMATERIAL7 &mat, int state,
char* texName1, char* texName2,
- float min, float max, BOOL bGlobalUpdate)
+ float min, float max, bool bGlobalUpdate)
{
D3DObjLevel2* p2;
D3DObjLevel3* p3;
@@ -1064,7 +1064,7 @@ BOOL CD3DEngine::AddSurface(int objRank, D3DVERTEX2* vertex, int nb, if ( bGlobalUpdate )
{
- m_bUpdateGeometry = TRUE;
+ m_bUpdateGeometry = true;
}
else
{
@@ -1083,15 +1083,15 @@ BOOL CD3DEngine::AddSurface(int objRank, D3DVERTEX2* vertex, int nb, }
m_objectParam[objRank].totalTriangle += nb-2;
- return TRUE;
+ return true;
}
// Adds a surface consisting of triangles joined.
// The buffer is not copied.
-BOOL CD3DEngine::AddQuick(int objRank, D3DObjLevel6* buffer,
+bool CD3DEngine::AddQuick(int objRank, D3DObjLevel6* buffer,
char* texName1, char* texName2,
- float min, float max, BOOL bGlobalUpdate)
+ float min, float max, bool bGlobalUpdate)
{
D3DObjLevel2* p2;
D3DObjLevel3* p3;
@@ -1110,7 +1110,7 @@ BOOL CD3DEngine::AddQuick(int objRank, D3DObjLevel6* buffer, if ( bGlobalUpdate )
{
- m_bUpdateGeometry = TRUE;
+ m_bUpdateGeometry = true;
}
else
{
@@ -1129,7 +1129,7 @@ BOOL CD3DEngine::AddQuick(int objRank, D3DObjLevel6* buffer, }
m_objectParam[objRank].totalTriangle += buffer->totalUsed-2;
- return TRUE;
+ return true;
}
@@ -1145,11 +1145,11 @@ void CD3DEngine::ChangeLOD() float oldLimit[2], newLimit[2];
float oldTerrain, newTerrain;
- oldLimit[0] = RetLimitLOD(0, TRUE);
- oldLimit[1] = RetLimitLOD(1, TRUE);
+ oldLimit[0] = RetLimitLOD(0, true);
+ oldLimit[1] = RetLimitLOD(1, true);
- newLimit[0] = RetLimitLOD(0, FALSE);
- newLimit[1] = RetLimitLOD(1, FALSE);
+ newLimit[0] = RetLimitLOD(0, false);
+ newLimit[1] = RetLimitLOD(1, false);
oldTerrain = m_terrainVision*m_lastClippingDistance;
newTerrain = m_terrainVision*m_clippingDistance;
@@ -1254,7 +1254,7 @@ D3DObjLevel6* CD3DEngine::SearchTriangle(int objRank, // Secondary changes the texture of an object.
-BOOL CD3DEngine::ChangeSecondTexture(int objRank, char* texName2)
+bool CD3DEngine::ChangeSecondTexture(int objRank, char* texName2)
{
D3DObjLevel2* newp2;
D3DObjLevel1* p1;
@@ -1282,7 +1282,7 @@ BOOL CD3DEngine::ChangeSecondTexture(int objRank, char* texName2) p2->table[l2] = 0;
}
}
- return TRUE;
+ return true;
}
@@ -1388,17 +1388,17 @@ int CD3DEngine::GetTriangles(int objRank, float min, float max, // Give the box of an object.
-BOOL CD3DEngine::GetBBox(int objRank, D3DVECTOR &min, D3DVECTOR &max)
+bool CD3DEngine::GetBBox(int objRank, D3DVECTOR &min, D3DVECTOR &max)
{
min = m_objectParam[objRank].bboxMin;
max = m_objectParam[objRank].bboxMax;
- return TRUE;
+ return true;
}
// Change the texture mapping for a list of triangles.
-BOOL CD3DEngine::ChangeTextureMapping(int objRank,
+bool CD3DEngine::ChangeTextureMapping(int objRank,
const D3DMATERIAL7 &mat, int state,
char* texName1, char* texName2,
float min, float max,
@@ -1411,7 +1411,7 @@ BOOL CD3DEngine::ChangeTextureMapping(int objRank, int l6, nb;
p6 = SearchTriangle(objRank, mat, state, texName1, texName2, min, max);
- if ( p6 == 0 ) return FALSE;
+ if ( p6 == 0 ) return false;
pv = &p6->vertex[0];
nb = p6->totalUsed;
@@ -1473,7 +1473,7 @@ BOOL CD3DEngine::ChangeTextureMapping(int objRank, }
}
- return TRUE;
+ return true;
}
// Change the texture mapping for a list of triangles
@@ -1521,7 +1521,7 @@ BOOL CD3DEngine::ChangeTextureMapping(int objRank, // <-----> tt |
// <--------------->
-BOOL CD3DEngine::TrackTextureMapping(int objRank,
+bool CD3DEngine::TrackTextureMapping(int objRank,
const D3DMATERIAL7 &mat, int state,
char* texName1, char* texName2,
float min, float max,
@@ -1536,12 +1536,12 @@ BOOL CD3DEngine::TrackTextureMapping(int objRank, int is[6], ie[6];
p6 = SearchTriangle(objRank, mat, state, texName1, texName2, min, max);
- if ( p6 == 0 ) return FALSE;
+ if ( p6 == 0 ) return false;
pv = &p6->vertex[0];
nb = p6->totalUsed;
- if ( nb < 12 || nb%6 != 0 ) return FALSE;
+ if ( nb < 12 || nb%6 != 0 ) return false;
while ( pos < 0.0f )
{
@@ -1611,7 +1611,7 @@ BOOL CD3DEngine::TrackTextureMapping(int objRank, pv += 6;
}
- return TRUE;
+ return true;
}
@@ -1681,14 +1681,14 @@ void CD3DEngine::UpdateGeometry() }
}
- m_bUpdateGeometry = FALSE;
+ m_bUpdateGeometry = false;
}
// Determines whether an object is visible, even partially.
// Transformation of "world" must be done​​!
-BOOL CD3DEngine::IsVisible(int objRank)
+bool CD3DEngine::IsVisible(int objRank)
{
D3DVECTOR center;
DWORD flags;
@@ -1700,11 +1700,11 @@ BOOL CD3DEngine::IsVisible(int objRank) if ( flags & D3DSTATUS_CLIPINTERSECTIONALL )
{
- m_objectParam[objRank].bVisible = FALSE;
- return FALSE;
+ m_objectParam[objRank].bVisible = false;
+ return false;
}
- m_objectParam[objRank].bVisible = TRUE;
- return TRUE;
+ m_objectParam[objRank].bVisible = true;
+ return true;
}
@@ -1790,7 +1790,7 @@ int CD3DEngine::DetectObject(FPOINT mouse) // Detects whether the mouse is in a triangle.
-BOOL CD3DEngine::DetectTriangle(FPOINT mouse, D3DVERTEX2 *triangle,
+bool CD3DEngine::DetectTriangle(FPOINT mouse, D3DVERTEX2 *triangle,
int objRank, float &dist)
{
D3DVECTOR p2D[3], p3D;
@@ -1802,21 +1802,21 @@ BOOL CD3DEngine::DetectTriangle(FPOINT mouse, D3DVERTEX2 *triangle, p3D.x = triangle[i].x;
p3D.y = triangle[i].y;
p3D.z = triangle[i].z;
- if ( !TransformPoint(p2D[i], objRank, p3D) ) return FALSE;
+ if ( !TransformPoint(p2D[i], objRank, p3D) ) return false;
}
if ( mouse.x < p2D[0].x &&
mouse.x < p2D[1].x &&
- mouse.x < p2D[2].x ) return FALSE;
+ mouse.x < p2D[2].x ) return false;
if ( mouse.x > p2D[0].x &&
mouse.x > p2D[1].x &&
- mouse.x > p2D[2].x ) return FALSE;
+ mouse.x > p2D[2].x ) return false;
if ( mouse.y < p2D[0].y &&
mouse.y < p2D[1].y &&
- mouse.y < p2D[2].y ) return FALSE;
+ mouse.y < p2D[2].y ) return false;
if ( mouse.y > p2D[0].y &&
mouse.y > p2D[1].y &&
- mouse.y > p2D[2].y ) return FALSE;
+ mouse.y > p2D[2].y ) return false;
a.x = p2D[0].x;
a.y = p2D[0].y;
@@ -1824,15 +1824,15 @@ BOOL CD3DEngine::DetectTriangle(FPOINT mouse, D3DVERTEX2 *triangle, b.y = p2D[1].y;
c.x = p2D[2].x;
c.y = p2D[2].y;
- if ( !IsInsideTriangle(a, b, c, mouse) ) return FALSE;
+ if ( !IsInsideTriangle(a, b, c, mouse) ) return false;
dist = (p2D[0].z+p2D[1].z+p2D[2].z)/3.0f;
- return TRUE;
+ return true;
}
// Detects whether an object is affected by the mouse.
-BOOL CD3DEngine::DetectBBox(int objRank, FPOINT mouse)
+bool CD3DEngine::DetectBBox(int objRank, FPOINT mouse)
{
D3DVECTOR p, pp;
FPOINT min, max;
@@ -1869,12 +1869,12 @@ BOOL CD3DEngine::DetectBBox(int objRank, FPOINT mouse) // Transforms a 3D point (x, y, z) in 2D space (x, y, -) of the window.
// The coordinated p2D.z gives the distance.
-BOOL CD3DEngine::TransformPoint(D3DVECTOR &p2D, int objRank, D3DVECTOR p3D)
+bool CD3DEngine::TransformPoint(D3DVECTOR &p2D, int objRank, D3DVECTOR p3D)
{
p3D = Transform(m_objectParam[objRank].transform, p3D);
p3D = Transform(m_matView, p3D);
- if ( p3D.z < 2.0f ) return FALSE; // behind?
+ if ( p3D.z < 2.0f ) return false; // behind?
p2D.x = (p3D.x/p3D.z)*m_matProj._11;
p2D.y = (p3D.y/p3D.z)*m_matProj._22;
@@ -1883,7 +1883,7 @@ BOOL CD3DEngine::TransformPoint(D3DVECTOR &p2D, int objRank, D3DVECTOR p3D) p2D.x = (p2D.x+1.0f)/2.0f; // [-1..1] -> [0..1]
p2D.y = (p2D.y+1.0f)/2.0f;
- return TRUE;
+ return true;
}
@@ -1900,7 +1900,7 @@ void CD3DEngine::ComputeDistance() {
for ( i=0 ; i<m_objectParamTotal ; i++ )
{
- if ( m_objectParam[i].bUsed == FALSE ) continue;
+ if ( m_objectParam[i].bUsed == false ) continue;
v.x = m_eyePt.x - m_objectParam[i].transform._41;
v.y = m_eyePt.y - m_objectParam[i].transform._42;
@@ -1925,7 +1925,7 @@ void CD3DEngine::ComputeDistance() for ( i=0 ; i<m_objectParamTotal ; i++ )
{
- if ( m_objectParam[i].bUsed == FALSE ) continue;
+ if ( m_objectParam[i].bUsed == false ) continue;
if ( m_objectParam[i].type == TYPETERRAIN )
{
@@ -1945,12 +1945,12 @@ void CD3DEngine::ComputeDistance() // Adjusts settings when first run.
-void CD3DEngine::FirstExecuteAdapt(BOOL bFirst)
+void CD3DEngine::FirstExecuteAdapt(bool bFirst)
{
if ( m_app->IsVideo8MB() )
{
- SetGroundSpot(FALSE);
- SetSkyMode(FALSE);
+ SetGroundSpot(false);
+ SetSkyMode(false);
}
if ( m_app->IsVideo32MB() && bFirst )
@@ -1966,12 +1966,12 @@ int CD3DEngine::GetVidMemTotal() return m_app->GetVidMemTotal();
}
-BOOL CD3DEngine::IsVideo8MB()
+bool CD3DEngine::IsVideo8MB()
{
return m_app->IsVideo8MB();
}
-BOOL CD3DEngine::IsVideo32MB()
+bool CD3DEngine::IsVideo32MB()
{
return m_app->IsVideo32MB();
}
@@ -1979,7 +1979,7 @@ BOOL CD3DEngine::IsVideo32MB() // Perform the list of all graphics devices available.
-BOOL CD3DEngine::EnumDevices(char *bufDevices, int lenDevices,
+bool CD3DEngine::EnumDevices(char *bufDevices, int lenDevices,
char *bufModes, int lenModes,
int &totalDevices, int &selectDevices,
int &totalModes, int &selectModes)
@@ -1990,12 +1990,12 @@ BOOL CD3DEngine::EnumDevices(char *bufDevices, int lenDevices, totalModes, selectModes);
}
-BOOL CD3DEngine::RetFullScreen()
+bool CD3DEngine::RetFullScreen()
{
return m_app->RetFullScreen();
}
-BOOL CD3DEngine::ChangeDevice(char *device, char *mode, BOOL bFull)
+bool CD3DEngine::ChangeDevice(char *device, char *mode, bool bFull)
{
return m_app->ChangeDevice(device, mode, bFull);
}
@@ -2060,32 +2060,32 @@ void CD3DEngine::SetViewParams(const D3DVECTOR &vEyePt, // Specifies the transformation matrix of an object.
-BOOL CD3DEngine::SetObjectTransform(int objRank, const D3DMATRIX &transform)
+bool CD3DEngine::SetObjectTransform(int objRank, const D3DMATRIX &transform)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
m_objectParam[objRank].transform = transform;
- return TRUE;
+ return true;
}
// Gives the transformation matrix of an object.
-BOOL CD3DEngine::GetObjectTransform(int objRank, D3DMATRIX &transform)
+bool CD3DEngine::GetObjectTransform(int objRank, D3DMATRIX &transform)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
transform = m_objectParam[objRank].transform;
- return TRUE;
+ return true;
}
// Specifies the type of an object.
-BOOL CD3DEngine::SetObjectType(int objRank, D3DTypeObj type)
+bool CD3DEngine::SetObjectType(int objRank, D3DTypeObj type)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
m_objectParam[objRank].type = type;
- return TRUE;
+ return true;
}
// Returns the type of an object.
@@ -2097,31 +2097,31 @@ D3DTypeObj CD3DEngine::RetObjectType(int objRank) // Specifies the transparency of an object.
-BOOL CD3DEngine::SetObjectTransparency(int objRank, float value)
+bool CD3DEngine::SetObjectTransparency(int objRank, float value)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
m_objectParam[objRank].transparency = value;
- return TRUE;
+ return true;
}
// Allocates a table for shade, if necessary.
-BOOL CD3DEngine::ShadowCreate(int objRank)
+bool CD3DEngine::ShadowCreate(int objRank)
{
int i;
// Already allocated?
- if ( m_objectParam[objRank].shadowRank != -1 ) return TRUE;
+ if ( m_objectParam[objRank].shadowRank != -1 ) return true;
for ( i=0 ; i<D3DMAXSHADOW ; i++ )
{
- if ( m_shadow[i].bUsed == FALSE ) // Free?
+ if ( m_shadow[i].bUsed == false ) // Free?
{
ZeroMemory(&m_shadow[i], sizeof(D3DShadow));
- m_shadow[i].bUsed = TRUE;
+ m_shadow[i].bUsed = true;
m_shadow[i].objRank = objRank;
m_shadow[i].height = 0.0f;
@@ -2131,10 +2131,10 @@ BOOL CD3DEngine::ShadowCreate(int objRank) {
m_shadowTotal = i+1;
}
- return TRUE;
+ return true;
}
}
- return FALSE; // not found
+ return false; // not found
}
// Removes the shadow associated with an object.
@@ -2148,7 +2148,7 @@ void CD3DEngine::ShadowDelete(int objRank) i = m_objectParam[objRank].shadowRank;
if ( i == -1 ) return;
- m_shadow[i].bUsed = FALSE;
+ m_shadow[i].bUsed = false;
m_shadow[i].objRank = -1;
m_shadow[i].pos = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_shadow[i].type = D3DSHADOWNORM;
@@ -2165,80 +2165,80 @@ void CD3DEngine::ShadowDelete(int objRank) // Specifies if the shadow is visible.
// For example, when an object is carried, he has no shadow.
-BOOL CD3DEngine::SetObjectShadowHide(int objRank, BOOL bHide)
+bool CD3DEngine::SetObjectShadowHide(int objRank, bool bHide)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
m_shadow[i].bHide = bHide;
- return TRUE;
+ return true;
}
// Specifies the type of the shadow of the object.
-BOOL CD3DEngine::SetObjectShadowType(int objRank, D3DShadowType type)
+bool CD3DEngine::SetObjectShadowType(int objRank, D3DShadowType type)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
m_shadow[i].type = type;
- return TRUE;
+ return true;
}
// Specifies the position of the shadow of the object.
-BOOL CD3DEngine::SetObjectShadowPos(int objRank, const D3DVECTOR &pos)
+bool CD3DEngine::SetObjectShadowPos(int objRank, const D3DVECTOR &pos)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
m_shadow[i].pos = pos;
- return TRUE;
+ return true;
}
// Specifies the normal shadow to the field of the object.
-BOOL CD3DEngine::SetObjectShadowNormal(int objRank, const D3DVECTOR &n)
+bool CD3DEngine::SetObjectShadowNormal(int objRank, const D3DVECTOR &n)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
m_shadow[i].normal = n;
- return TRUE;
+ return true;
}
// Specifies the angle of the shadow of the object.
-BOOL CD3DEngine::SetObjectShadowAngle(int objRank, float angle)
+bool CD3DEngine::SetObjectShadowAngle(int objRank, float angle)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
m_shadow[i].angle = angle;
- return TRUE;
+ return true;
}
// Specifies the radius of the shadow of the object.
-BOOL CD3DEngine::SetObjectShadowRadius(int objRank, float radius)
+bool CD3DEngine::SetObjectShadowRadius(int objRank, float radius)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
m_shadow[i].radius = radius;
- return TRUE;
+ return true;
}
// Returns the radius of the shadow of the object.
@@ -2248,35 +2248,35 @@ float CD3DEngine::RetObjectShadowRadius(int objRank) if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return 0.0f;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
return m_shadow[i].radius;
}
// Specifies the intensity of the shadow of the object.
-BOOL CD3DEngine::SetObjectShadowIntensity(int objRank, float intensity)
+bool CD3DEngine::SetObjectShadowIntensity(int objRank, float intensity)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
m_shadow[i].intensity = intensity;
- return TRUE;
+ return true;
}
// Specifies the height of the shadow of the object.
-BOOL CD3DEngine::SetObjectShadowHeight(int objRank, float h)
+bool CD3DEngine::SetObjectShadowHeight(int objRank, float h)
{
- if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return FALSE;
+ if ( objRank < 0 || objRank >= D3DMAXOBJECT ) return false;
int i = m_objectParam[objRank].shadowRank;
- if ( i == -1 ) return FALSE;
+ if ( i == -1 ) return false;
m_shadow[i].height = h;
- return TRUE;
+ return true;
}
@@ -2291,7 +2291,7 @@ void CD3DEngine::GroundSpotFlush() int s, y;
ZeroMemory(m_groundSpot, sizeof(D3DGroundSpot)*D3DMAXGROUNDSPOT);
- m_bFirstGroundSpot = TRUE; // drawing power first
+ m_bFirstGroundSpot = true; // drawing power first
for ( s=0 ; s<16 ; s++ )
{
@@ -2324,10 +2324,10 @@ int CD3DEngine::GroundSpotCreate() for ( i=0 ; i<D3DMAXGROUNDSPOT ; i++ )
{
- if ( m_groundSpot[i].bUsed == FALSE ) // free?
+ if ( m_groundSpot[i].bUsed == false ) // free?
{
ZeroMemory(&m_groundSpot[i], sizeof(D3DGroundSpot));
- m_groundSpot[i].bUsed = TRUE;
+ m_groundSpot[i].bUsed = true;
m_groundSpot[i].smooth = 1.0f;
return i;
}
@@ -2339,49 +2339,49 @@ int CD3DEngine::GroundSpotCreate() void CD3DEngine::GroundSpotDelete(int rank)
{
- m_groundSpot[rank].bUsed = FALSE;
+ m_groundSpot[rank].bUsed = false;
m_groundSpot[rank].pos = D3DVECTOR(0.0f, 0.0f, 0.0f);
}
// Specifies the position of surface marking of the object.
-BOOL CD3DEngine::SetObjectGroundSpotPos(int rank, const D3DVECTOR &pos)
+bool CD3DEngine::SetObjectGroundSpotPos(int rank, const D3DVECTOR &pos)
{
m_groundSpot[rank].pos = pos;
- return TRUE;
+ return true;
}
// Specifies the radius of surface marking of the object.
-BOOL CD3DEngine::SetObjectGroundSpotRadius(int rank, float radius)
+bool CD3DEngine::SetObjectGroundSpotRadius(int rank, float radius)
{
m_groundSpot[rank].radius = radius;
- return TRUE;
+ return true;
}
// Specifies the color of a mark on the ground.
-BOOL CD3DEngine::SetObjectGroundSpotColor(int rank, D3DCOLORVALUE color)
+bool CD3DEngine::SetObjectGroundSpotColor(int rank, D3DCOLORVALUE color)
{
m_groundSpot[rank].color = color;
- return TRUE;
+ return true;
}
// Specifies the height min / max.
-BOOL CD3DEngine::SetObjectGroundSpotMinMax(int rank, float min, float max)
+bool CD3DEngine::SetObjectGroundSpotMinMax(int rank, float min, float max)
{
m_groundSpot[rank].min = min;
m_groundSpot[rank].max = max;
- return TRUE;
+ return true;
}
// Specifies the transition factor.
-BOOL CD3DEngine::SetObjectGroundSpotSmooth(int rank, float smooth)
+bool CD3DEngine::SetObjectGroundSpotSmooth(int rank, float smooth)
{
m_groundSpot[rank].smooth = smooth;
- return TRUE;
+ return true;
}
@@ -2392,7 +2392,7 @@ int CD3DEngine::GroundMarkCreate(D3DVECTOR pos, float radius, int dx, int dy, char* table)
{
ZeroMemory(&m_groundMark, sizeof(D3DGroundMark));
- m_groundMark.bUsed = TRUE;
+ m_groundMark.bUsed = true;
m_groundMark.phase = 1;
m_groundMark.delay[0] = delay1;
m_groundMark.delay[1] = delay2;
@@ -2408,10 +2408,10 @@ int CD3DEngine::GroundMarkCreate(D3DVECTOR pos, float radius, // Clears the ground.
-BOOL CD3DEngine::GroundMarkDelete(int rank)
+bool CD3DEngine::GroundMarkDelete(int rank)
{
ZeroMemory(&m_groundMark, sizeof(D3DGroundMark));
- return TRUE;
+ return true;
}
@@ -2423,7 +2423,7 @@ void CD3DEngine::SetLimitLOD(int rank, float limit) m_limitLOD[rank] = limit;
}
-float CD3DEngine::RetLimitLOD(int rank, BOOL bLast)
+float CD3DEngine::RetLimitLOD(int rank, bool bLast)
{
float limit;
@@ -2457,12 +2457,12 @@ void CD3DEngine::SetTerrainVision(float vision) // Management of the global mode of shading.
-void CD3DEngine::SetShadow(BOOL bMode)
+void CD3DEngine::SetShadow(bool bMode)
{
m_bShadow = bMode;
}
-BOOL CD3DEngine::RetShadow()
+bool CD3DEngine::RetShadow()
{
return m_bShadow;
}
@@ -2470,12 +2470,12 @@ BOOL CD3DEngine::RetShadow() // Management of the global mode of marking.
-void CD3DEngine::SetGroundSpot(BOOL bMode)
+void CD3DEngine::SetGroundSpot(bool bMode)
{
m_bGroundSpot = bMode;
}
-BOOL CD3DEngine::RetGroundSpot()
+bool CD3DEngine::RetGroundSpot()
{
return m_bGroundSpot;
}
@@ -2483,12 +2483,12 @@ BOOL CD3DEngine::RetGroundSpot() // Management of the global mode of contamination.
-void CD3DEngine::SetDirty(BOOL bMode)
+void CD3DEngine::SetDirty(bool bMode)
{
m_bDirty = bMode;
}
-BOOL CD3DEngine::RetDirty()
+bool CD3DEngine::RetDirty()
{
return m_bDirty;
}
@@ -2496,12 +2496,12 @@ BOOL CD3DEngine::RetDirty() // Management of the global mode of horizontal fog patches.
-void CD3DEngine::SetFog(BOOL bMode)
+void CD3DEngine::SetFog(bool bMode)
{
m_bFog = bMode;
}
-BOOL CD3DEngine::RetFog()
+bool CD3DEngine::RetFog()
{
return m_bFog;
}
@@ -2509,7 +2509,7 @@ BOOL CD3DEngine::RetFog() // ndicates whether it is possible to give a color SetState.
-BOOL CD3DEngine::RetStateColor()
+bool CD3DEngine::RetStateColor()
{
return m_bStateColor;
}
@@ -2555,14 +2555,14 @@ int CD3DEngine::RetRankView() // Whether to draw the world from the interface.
-void CD3DEngine::SetDrawWorld(BOOL bDraw)
+void CD3DEngine::SetDrawWorld(bool bDraw)
{
m_bDrawWorld = bDraw;
}
// Whether to draw the world on the interface.
-void CD3DEngine::SetDrawFront(BOOL bDraw)
+void CD3DEngine::SetDrawFront(bool bDraw)
{
m_bDrawFront = bDraw;
}
@@ -2614,7 +2614,7 @@ D3DCOLOR CD3DEngine::RetFogColor(int rank) // Beyond this distance, nothing is visible.
// Shortly (according SetFogStart), one enters the fog.
-void CD3DEngine::SetDeepView(float length, int rank, BOOL bRef)
+void CD3DEngine::SetDeepView(float length, int rank, bool bRef)
{
if ( bRef )
{
@@ -2649,7 +2649,7 @@ float CD3DEngine::RetFogStart(int rank) void CD3DEngine::SetBackground(char *name, D3DCOLOR up, D3DCOLOR down,
D3DCOLOR cloudUp, D3DCOLOR cloudDown,
- BOOL bFull, BOOL bQuarter)
+ bool bFull, bool bQuarter)
{
strcpy(m_backgroundName, name);
m_backgroundColorUp = up;
@@ -2664,7 +2664,7 @@ void CD3DEngine::SetBackground(char *name, D3DCOLOR up, D3DCOLOR down, void CD3DEngine::RetBackground(char *name, D3DCOLOR &up, D3DCOLOR &down,
D3DCOLOR &cloudUp, D3DCOLOR &cloudDown,
- BOOL &bFull, BOOL &bQuarter)
+ bool &bFull, bool &bQuarter)
{
strcpy(name, m_backgroundName);
up = m_backgroundColorUp;
@@ -2689,7 +2689,7 @@ void CD3DEngine::SetFrontsizeName(char *name) // Specifies whether to draw the foreground.
-void CD3DEngine::SetOverFront(BOOL bFront)
+void CD3DEngine::SetOverFront(bool bFront)
{
m_bOverFront = bFront;
}
@@ -2792,12 +2792,12 @@ int CD3DEngine::RetTextureQuality() // Management mode of toto.
-void CD3DEngine::SetTotoMode(BOOL bPresent)
+void CD3DEngine::SetTotoMode(bool bPresent)
{
m_bTotoMode = bPresent;
}
-BOOL CD3DEngine::RetTotoMode()
+bool CD3DEngine::RetTotoMode()
{
return m_bTotoMode;
}
@@ -2805,12 +2805,12 @@ BOOL CD3DEngine::RetTotoMode() // Managing the mode of foreground.
-void CD3DEngine::SetLensMode(BOOL bPresent)
+void CD3DEngine::SetLensMode(bool bPresent)
{
m_bLensMode = bPresent;
}
-BOOL CD3DEngine::RetLensMode()
+bool CD3DEngine::RetLensMode()
{
return m_bLensMode;
}
@@ -2818,12 +2818,12 @@ BOOL CD3DEngine::RetLensMode() // Managing the mode of water.
-void CD3DEngine::SetWaterMode(BOOL bPresent)
+void CD3DEngine::SetWaterMode(bool bPresent)
{
m_bWaterMode = bPresent;
}
-BOOL CD3DEngine::RetWaterMode()
+bool CD3DEngine::RetWaterMode()
{
return m_bWaterMode;
}
@@ -2831,12 +2831,12 @@ BOOL CD3DEngine::RetWaterMode() // Managing the mode of sky.
-void CD3DEngine::SetSkyMode(BOOL bPresent)
+void CD3DEngine::SetSkyMode(bool bPresent)
{
m_bSkyMode = bPresent;
}
-BOOL CD3DEngine::RetSkyMode()
+bool CD3DEngine::RetSkyMode()
{
return m_bSkyMode;
}
@@ -2844,12 +2844,12 @@ BOOL CD3DEngine::RetSkyMode() // Managing the mode of background.
-void CD3DEngine::SetBackForce(BOOL bPresent)
+void CD3DEngine::SetBackForce(bool bPresent)
{
m_bBackForce = bPresent;
}
-BOOL CD3DEngine::RetBackForce()
+bool CD3DEngine::RetBackForce()
{
return m_bBackForce;
}
@@ -2857,12 +2857,12 @@ BOOL CD3DEngine::RetBackForce() // Managing the mode of planets.
-void CD3DEngine::SetPlanetMode(BOOL bPresent)
+void CD3DEngine::SetPlanetMode(bool bPresent)
{
m_bPlanetMode = bPresent;
}
-BOOL CD3DEngine::RetPlanetMode()
+bool CD3DEngine::RetPlanetMode()
{
return m_bPlanetMode;
}
@@ -2870,12 +2870,12 @@ BOOL CD3DEngine::RetPlanetMode() // Managing the mode of dymanic lights.
-void CD3DEngine::SetLightMode(BOOL bPresent)
+void CD3DEngine::SetLightMode(bool bPresent)
{
m_bLightMode = bPresent;
}
-BOOL CD3DEngine::RetLightMode()
+bool CD3DEngine::RetLightMode()
{
return m_bLightMode;
}
@@ -2883,12 +2883,12 @@ BOOL CD3DEngine::RetLightMode() // Management of the indentation mode while editing (CEdit).
-void CD3DEngine::SetEditIndentMode(BOOL bAuto)
+void CD3DEngine::SetEditIndentMode(bool bAuto)
{
m_bEditIndentMode = bAuto;
}
-BOOL CD3DEngine::RetEditIndentMode()
+bool CD3DEngine::RetEditIndentMode()
{
return m_bEditIndentMode;
}
@@ -2990,24 +2990,24 @@ void QuarterName(char *buffer, char *name, int quarter) // Frees texture.
-BOOL CD3DEngine::FreeTexture(char* name)
+bool CD3DEngine::FreeTexture(char* name)
{
- if ( name[0] == 0 ) return TRUE;
+ if ( name[0] == 0 ) return true;
if ( D3DTextr_DestroyTexture(name) != S_OK )
{
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
// Load a texture.
-BOOL CD3DEngine::LoadTexture(char* name, int stage)
+bool CD3DEngine::LoadTexture(char* name, int stage)
{
DWORD mode;
- if ( name[0] == 0 ) return TRUE;
+ if ( name[0] == 0 ) return true;
if ( D3DTextr_GetSurface(name) == NULL )
{
@@ -3022,26 +3022,26 @@ BOOL CD3DEngine::LoadTexture(char* name, int stage) if ( D3DTextr_CreateTextureFromFile(name, stage, mode) != S_OK )
{
- return FALSE;
+ return false;
}
if ( D3DTextr_Restore(name, m_pD3DDevice) != S_OK )
{
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
// Load all the textures of the scene.
-BOOL CD3DEngine::LoadAllTexture()
+bool CD3DEngine::LoadAllTexture()
{
D3DObjLevel1* p1;
D3DObjLevel2* p2;
int l1, i;
char name[50];
- BOOL bOK = TRUE;
+ bool bOK = true;
#if _POLISH
LoadTexture("textp.tga");
@@ -3086,12 +3086,12 @@ BOOL CD3DEngine::LoadAllTexture() if ( p2 == 0 || p2->texName1[0] != 0 )
{
- if ( !LoadTexture(p2->texName1, 0) ) bOK = FALSE;
+ if ( !LoadTexture(p2->texName1, 0) ) bOK = false;
}
if ( p2 == 0 || p2->texName2[0] != 0 )
{
- if ( !LoadTexture(p2->texName2, 1) ) bOK = FALSE;
+ if ( !LoadTexture(p2->texName2, 1) ) bOK = false;
}
}
return bOK;
@@ -3152,7 +3152,7 @@ HRESULT CD3DEngine::FrameMove(float rTime) {
m_groundMark.intensity = 0.0f;
m_groundMark.phase = 0;
- m_groundMark.bUsed = FALSE;
+ m_groundMark.bUsed = false;
}
}
}
@@ -3180,7 +3180,7 @@ void CD3DEngine::StepSimul(float rTime) void CD3DEngine::SetState(int state, D3DCOLOR color)
{
- BOOL bSecond;
+ bool bSecond;
if ( state == m_lastState &&
color == m_lastColor ) return;
@@ -3199,10 +3199,10 @@ void CD3DEngine::SetState(int state, D3DCOLOR color) if ( state & D3DSTATETTb ) // The transparent black texture?
{
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, m_blackSrcBlend[1]);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_DESTBLEND, m_blackDestBlend[1]);
//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, table_blend[debug_blend1]);
@@ -3217,10 +3217,10 @@ void CD3DEngine::SetState(int state, D3DCOLOR color) }
else if ( state & D3DSTATETTw ) // The transparent white texture?
{
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, m_whiteSrcBlend[1]);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_DESTBLEND, m_whiteDestBlend[1]);
//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, table_blend[debug_blend3]);
@@ -3235,10 +3235,10 @@ void CD3DEngine::SetState(int state, D3DCOLOR color) }
else if ( state & D3DSTATETCb ) // The transparent black color?
{
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, m_blackSrcBlend[1]);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_DESTBLEND, m_blackDestBlend[1]);
//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, table_blend[debug_blend1]);
@@ -3250,10 +3250,10 @@ void CD3DEngine::SetState(int state, D3DCOLOR color) }
else if ( state & D3DSTATETCw ) // The transparent white color?
{
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, m_whiteSrcBlend[1]);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_DESTBLEND, m_whiteDestBlend[1]);
//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, table_blend[debug_blend3]);
@@ -3265,10 +3265,10 @@ void CD3DEngine::SetState(int state, D3DCOLOR color) }
else if ( state & D3DSTATETD ) // diffuse color as transparent?
{
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, m_diffuseSrcBlend[1]);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_DESTBLEND, m_diffuseDestBlend[1]);
@@ -3278,10 +3278,10 @@ void CD3DEngine::SetState(int state, D3DCOLOR color) }
else if ( state & D3DSTATEALPHA ) // image with alpha channel?
{
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, true);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHAFUNC, D3DCMP_GREATER);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHAREF, (DWORD)(128));
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, m_alphaSrcBlend[1]);
@@ -3296,10 +3296,10 @@ void CD3DEngine::SetState(int state, D3DCOLOR color) }
else // normal ?
{
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, false);
m_pD3DDevice->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_MODULATE);
m_pD3DDevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
@@ -3309,12 +3309,12 @@ void CD3DEngine::SetState(int state, D3DCOLOR color) if ( state & D3DSTATEFOG )
{
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, true);
}
bSecond = m_bGroundSpot|m_bDirty;
- if ( !m_bGroundSpot && (state & D3DSTATESECOND) != 0 ) bSecond = FALSE;
- if ( !m_bDirty && (state & D3DSTATESECOND) == 0 ) bSecond = FALSE;
+ if ( !m_bGroundSpot && (state & D3DSTATESECOND) != 0 ) bSecond = false;
+ if ( !m_bDirty && (state & D3DSTATESECOND) == 0 ) bSecond = false;
if ( (state & D3DSTATEDUALb) && bSecond )
{
@@ -3644,7 +3644,7 @@ void CD3DEngine::RenderGroundSpot() float tu, tv, cx, cy, px, py, ppx, ppy;
float intensity, level;
char texName[20];
- BOOL bClear, bSet;
+ bool bClear, bSet;
if ( !m_bFirstGroundSpot &&
m_groundMark.drawPos.x == m_groundMark.pos.x &&
@@ -3659,8 +3659,8 @@ void CD3DEngine::RenderGroundSpot() max.x = min.x+254.0f+2.0f;
max.y = min.y+254.0f+2.0f;
- bClear = FALSE;
- bSet = FALSE;
+ bClear = false;
+ bSet = false;
// Calculate the area to be erased.
dot = (int)(m_groundMark.drawRadius/2.0f);
@@ -3685,7 +3685,7 @@ void CD3DEngine::RenderGroundSpot() px+dot >= min.x && py+dot >= min.y &&
px-dot <= max.x && py-dot <= max.y ) )
{
- bClear = TRUE;
+ bClear = true;
}
// Calculate the area to draw.
@@ -3710,7 +3710,7 @@ void CD3DEngine::RenderGroundSpot() px+dot >= min.x && py+dot >= min.y &&
px-dot <= max.x && py-dot <= max.y )
{
- bSet = TRUE;
+ bSet = true;
}
if ( bClear || bSet )
@@ -3738,7 +3738,7 @@ void CD3DEngine::RenderGroundSpot() // Draw the new shadows.
for ( i=0 ; i<D3DMAXGROUNDSPOT ; i++ )
{
- if ( m_groundSpot[i].bUsed == FALSE ||
+ if ( m_groundSpot[i].bUsed == false ||
m_groundSpot[i].radius == 0.0f ) continue;
if ( m_groundSpot[i].min == 0.0f &&
@@ -3803,7 +3803,7 @@ void CD3DEngine::RenderGroundSpot() pos.x = (256.0f*(s%4)+ix)*3200.0f/1024.0f - 1600.0f;
pos.z = (256.0f*(s/4)+iy)*3200.0f/1024.0f - 1600.0f;
pos.y = 0.0f;
- level = m_terrain->RetFloorLevel(pos, TRUE);
+ level = m_terrain->RetFloorLevel(pos, true);
if ( level < m_groundSpot[i].min ||
level > m_groundSpot[i].max ) continue;
@@ -3888,7 +3888,7 @@ void CD3DEngine::RenderGroundSpot() for ( i=0 ; i<D3DMAXGROUNDSPOT ; i++ )
{
- if ( m_groundSpot[i].bUsed == FALSE ||
+ if ( m_groundSpot[i].bUsed == false ||
m_groundSpot[i].radius == 0.0f )
{
m_groundSpot[i].drawRadius = 0.0f;
@@ -3904,7 +3904,7 @@ void CD3DEngine::RenderGroundSpot() m_groundMark.drawRadius = m_groundMark.radius;
m_groundMark.drawIntensity = m_groundMark.intensity;
- m_bFirstGroundSpot = FALSE;
+ m_bFirstGroundSpot = false;
}
// Draw all the shadows.
@@ -3921,8 +3921,8 @@ void CD3DEngine::DrawShadow() float dp, h, d, D;
int i;
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false);
D3DUtil_SetIdentityMatrix(matrix);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_WORLD, &matrix);
@@ -4108,8 +4108,8 @@ void CD3DEngine::DrawShadow() AddStatisticTriangle(2);
}
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, true);
}
@@ -4128,7 +4128,7 @@ HRESULT CD3DEngine::Render() D3DVERTEX2* pv;
int l1, l2, l3, l4, l5, objRank, tState;
CInterface* pInterface;
- BOOL bTransparent;
+ bool bTransparent;
D3DCOLOR color, tColor;
if ( !m_bRender ) return S_OK;
@@ -4169,13 +4169,13 @@ HRESULT CD3DEngine::Render() if ( m_bSkyMode ) m_cloud->Draw(); // draws the clouds
// Display the objects
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, true);
//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZBIAS, F2DW(16));
//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_PROJECTION, &m_matProj);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, true);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, true);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGCOLOR, m_fogColor[m_rankView]);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGVERTEXMODE, D3DFOG_LINEAR);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGSTART, F2DW(m_deepView[m_rankView]*m_fogStart[m_rankView]));
@@ -4250,7 +4250,7 @@ HRESULT CD3DEngine::Render() }
// Draw objects.
- bTransparent = FALSE;
+ bTransparent = false;
p1 = m_objectPointer;
for ( l1=0 ; l1<p1->totalUsed ; l1++ )
{
@@ -4286,7 +4286,7 @@ HRESULT CD3DEngine::Render() SetMaterial(p6->material);
if ( m_objectParam[objRank].transparency != 0.0f ) // transparent ?
{
- bTransparent = TRUE;
+ bTransparent = true;
continue;
}
SetState(p6->state);
@@ -4399,10 +4399,10 @@ HRESULT CD3DEngine::Render() }
// Draw the user interface over the scene.
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_VIEW, &m_matViewInterface);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_PROJECTION, &m_matProjInterface);
@@ -4418,14 +4418,14 @@ HRESULT CD3DEngine::Render() if ( m_bDrawFront )
{
// Display the objects
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, true);
//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZBIAS, F2DW(16));
//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_PROJECTION, &m_matProj);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, m_ambiantColor[m_rankView]);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, true);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, true);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGCOLOR, m_fogColor[m_rankView]);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGVERTEXMODE, D3DFOG_LINEAR);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGSTART, F2DW(m_deepView[m_rankView]*m_fogStart[m_rankView]));
@@ -4492,10 +4492,10 @@ HRESULT CD3DEngine::Render() m_particule->DrawParticule(SH_FRONT); // draws the particles of the 3D world
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_VIEW, &m_matViewInterface);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_PROJECTION, &m_matProjInterface);
@@ -4559,11 +4559,11 @@ void CD3DEngine::DrawBackgroundGradient(D3DCOLOR up, D3DCOLOR down) color[1] = down;
color[2] = 0x00000000;
-//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
SetTexture("xxx.tga"); // no texture
SetState(D3DSTATENORMAL);
@@ -4623,11 +4623,11 @@ void CD3DEngine::DrawBackgroundImageQuarter(FPOINT p1, FPOINT p2, char *name) v2 = v1+h;
}
-//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
SetTexture(name);
SetState(D3DSTATEWRAP);
@@ -4698,11 +4698,11 @@ void CD3DEngine::DrawPlanet() {
if ( !m_planet->PlanetExist() ) return;
-//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_VIEW, &m_matViewInterface);
m_pD3DDevice->SetTransform(D3DTRANSFORMSTATE_PROJECTION, &m_matProjInterface);
@@ -4746,11 +4746,11 @@ void CD3DEngine::DrawFrontsize() vertex[2] = D3DVERTEX2(D3DVECTOR(p2.x, p1.y, 0.0f), n, u2,v2);
vertex[3] = D3DVERTEX2(D3DVECTOR(p2.x, p2.y, 0.0f), n, u2,v1);
-//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, false);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
SetTexture(m_frontsizeName);
SetState(D3DSTATECLAMP|D3DSTATETTb);
@@ -4784,11 +4784,11 @@ void CD3DEngine::DrawOverColor() color[1] = m_overColor;
color[2] = 0x00000000;
-//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, FALSE);
+//? m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, false);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_AMBIENT, 0xffffffff);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, FALSE );
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, FALSE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_LIGHTING, false );
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FOGENABLE, false);
SetTexture("xxx.tga"); // no texture
SetState(m_overMode);
@@ -4823,7 +4823,7 @@ void CD3DEngine::SetHiliteRank(int *rankList) // Give the box in the 2D screen of any object.
-BOOL CD3DEngine::GetBBox2D(int objRank, FPOINT &min, FPOINT &max)
+bool CD3DEngine::GetBBox2D(int objRank, FPOINT &min, FPOINT &max)
{
D3DVECTOR p, pp;
int i;
@@ -4853,9 +4853,9 @@ BOOL CD3DEngine::GetBBox2D(int objRank, FPOINT &min, FPOINT &max) if ( min.x == 1000000.0f ||
min.y == 1000000.0f ||
max.x == -1000000.0f ||
- max.y == -1000000.0f ) return FALSE;
+ max.y == -1000000.0f ) return false;
- return TRUE;
+ return true;
}
// Determines the rectangle of the object highlighted, which will be designed by CD3DApplication.
@@ -4887,19 +4887,19 @@ void CD3DEngine::DrawHilite() max.x == -1000000.0f ||
max.y == -1000000.0f )
{
- m_bHilite = FALSE; // not highlighted
+ m_bHilite = false; // not highlighted
}
else
{
m_hiliteP1 = min;
m_hiliteP2 = max;
- m_bHilite = TRUE;
+ m_bHilite = true;
}
}
// Give the rectangle highlighted by drawing CD3DApplication.
-BOOL CD3DEngine::GetHilite(FPOINT &p1, FPOINT &p2)
+bool CD3DEngine::GetHilite(FPOINT &p1, FPOINT &p2)
{
p1 = m_hiliteP1;
p2 = m_hiliteP2;
@@ -4921,15 +4921,15 @@ int CD3DEngine::RetStatisticTriangle() return m_statisticTriangle;
}
-BOOL CD3DEngine::GetSpriteCoord(int &x, int &y)
+bool CD3DEngine::GetSpriteCoord(int &x, int &y)
{
D3DVIEWPORT7 vp;
D3DVECTOR v, vv;
- return FALSE;
+ return false;
//?
vv = D3DVECTOR(0.0f, 0.0f, 0.0f);
- if ( !TransformPoint(v, 20*20+1, vv) ) return FALSE;
+ if ( !TransformPoint(v, 20*20+1, vv) ) return false;
m_pD3DDevice->GetViewport(&vp);
v.x *= vp.dwWidth/2;
@@ -4939,13 +4939,13 @@ BOOL CD3DEngine::GetSpriteCoord(int &x, int &y) x = (int)v.x;
y = (int)v.y;
- return TRUE;
+ return true;
}
// Tests whether to exclude a point.
-BOOL IsExcludeColor(FPOINT *pExclu, int x, int y)
+bool IsExcludeColor(FPOINT *pExclu, int x, int y)
{
int i;
@@ -4956,22 +4956,22 @@ BOOL IsExcludeColor(FPOINT *pExclu, int x, int y) if ( x >= (int)(pExclu[i+0].x*256.0f) &&
x < (int)(pExclu[i+1].x*256.0f) &&
y >= (int)(pExclu[i+0].y*256.0f) &&
- y < (int)(pExclu[i+1].y*256.0f) ) return TRUE; // exclude
+ y < (int)(pExclu[i+1].y*256.0f) ) return true; // exclude
i += 2;
}
- return FALSE; // point to include
+ return false; // point to include
}
// Change the color of a texture.
-BOOL CD3DEngine::ChangeColor(char *name,
+bool CD3DEngine::ChangeColor(char *name,
D3DCOLORVALUE colorRef1, D3DCOLORVALUE colorNew1,
D3DCOLORVALUE colorRef2, D3DCOLORVALUE colorNew2,
float tolerance1, float tolerance2,
FPOINT ts, FPOINT ti,
- FPOINT *pExclu, float shift, BOOL bHSV)
+ FPOINT *pExclu, float shift, bool bHSV)
{
LPDIRECTDRAWSURFACE7 surface;
DDSURFACEDESC2 ddsd;
@@ -4987,14 +4987,14 @@ BOOL CD3DEngine::ChangeColor(char *name, colorRef1.b == colorNew1.b &&
colorRef2.r == colorNew2.r &&
colorRef2.g == colorNew2.g &&
- colorRef2.b == colorNew2.b ) return TRUE;
+ colorRef2.b == colorNew2.b ) return true;
surface = D3DTextr_GetSurface(name);
- if ( surface == 0 ) return FALSE;
+ if ( surface == 0 ) return false;
ZeroMemory(&ddsd, sizeof(DDSURFACEDESC2));
ddsd.dwSize = sizeof(DDSURFACEDESC2);
- if ( surface->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL) != DD_OK ) return FALSE;
+ if ( surface->Lock(NULL, &ddsd, DDLOCK_WAIT, NULL) != DD_OK ) return false;
dx = ddsd.dwWidth;
dy = ddsd.dwHeight;
@@ -5076,42 +5076,42 @@ BOOL CD3DEngine::ChangeColor(char *name, }
surface->Unlock(NULL);
- return TRUE;
+ return true;
}
// Open an image to work directly in it.
-BOOL CD3DEngine::OpenImage(char *name)
+bool CD3DEngine::OpenImage(char *name)
{
//? D3DTextr_Invalidate(name);
//? LoadTexture(name);
m_imageSurface = D3DTextr_GetSurface(name);
- if ( m_imageSurface == 0 ) return FALSE;
+ if ( m_imageSurface == 0 ) return false;
ZeroMemory(&m_imageDDSD, sizeof(DDSURFACEDESC2));
m_imageDDSD.dwSize = sizeof(DDSURFACEDESC2);
if ( m_imageSurface->Lock(NULL, &m_imageDDSD, DDLOCK_WAIT, NULL) != DD_OK )
{
- return FALSE;
+ return false;
}
if ( m_imageDDSD.ddpfPixelFormat.dwRGBBitCount != 16 )
{
m_imageSurface->Unlock(NULL);
- return FALSE;
+ return false;
}
m_imageDX = m_imageDDSD.dwWidth;
m_imageDY = m_imageDDSD.dwHeight;
- return TRUE;
+ return true;
}
// Copy the working image.
-BOOL CD3DEngine::CopyImage()
+bool CD3DEngine::CopyImage()
{
WORD* pbSurf;
int y;
@@ -5127,17 +5127,17 @@ BOOL CD3DEngine::CopyImage() pbSurf += m_imageDDSD.lPitch*y/2;
memcpy(m_imageCopy+y*m_imageDX, pbSurf, m_imageDX*sizeof(WORD));
}
- return TRUE;
+ return true;
}
// Restores the image work.
-BOOL CD3DEngine::LoadImage()
+bool CD3DEngine::LoadImage()
{
WORD* pbSurf;
int y;
- if ( m_imageCopy == 0 ) return FALSE;
+ if ( m_imageCopy == 0 ) return false;
for ( y=0 ; y<m_imageDY ; y++ )
{
@@ -5145,12 +5145,12 @@ BOOL CD3DEngine::LoadImage() pbSurf += m_imageDDSD.lPitch*y/2;
memcpy(pbSurf, m_imageCopy+y*m_imageDX, m_imageDX*sizeof(WORD));
}
- return TRUE;
+ return true;
}
// Scroll the copy of the working image.
-BOOL CD3DEngine::ScrollImage(int dx, int dy)
+bool CD3DEngine::ScrollImage(int dx, int dy)
{
int x, y;
@@ -5192,18 +5192,18 @@ BOOL CD3DEngine::ScrollImage(int dx, int dy) }
}
- return TRUE;
+ return true;
}
// Draws a point in the image work.
-BOOL CD3DEngine::SetDot(int x, int y, D3DCOLORVALUE color)
+bool CD3DEngine::SetDot(int x, int y, D3DCOLORVALUE color)
{
WORD* pbSurf;
WORD r,g,b, w;
if ( x < 0 || x >= m_imageDX ||
- y < 0 || y >= m_imageDY ) return FALSE;
+ y < 0 || y >= m_imageDY ) return false;
#if 1
if ( color.r < 0.0f ) color.r = 0.0f;
@@ -5244,35 +5244,35 @@ BOOL CD3DEngine::SetDot(int x, int y, D3DCOLORVALUE color) pbSurf += x;
*pbSurf = w;
- return TRUE;
+ return true;
}
// Closes the working image.
-BOOL CD3DEngine::CloseImage()
+bool CD3DEngine::CloseImage()
{
m_imageSurface->Unlock(NULL);
- return TRUE;
+ return true;
}
// Writes a .BMP screenshot.
-BOOL CD3DEngine::WriteScreenShot(char *filename, int width, int height)
+bool CD3DEngine::WriteScreenShot(char *filename, int width, int height)
{
return m_app->WriteScreenShot(filename, width, height);
}
// Initializes an hDC on the rendering surface.
-BOOL CD3DEngine::GetRenderDC(HDC &hDC)
+bool CD3DEngine::GetRenderDC(HDC &hDC)
{
return m_app->GetRenderDC(hDC);
}
// Frees the hDC of the rendering surface.
-BOOL CD3DEngine::ReleaseRenderDC(HDC &hDC)
+bool CD3DEngine::ReleaseRenderDC(HDC &hDC)
{
return m_app->ReleaseRenderDC(hDC);
}
@@ -5282,7 +5282,7 @@ PBITMAPINFO CD3DEngine::CreateBitmapInfoStruct(HBITMAP hBmp) return m_app->CreateBitmapInfoStruct(hBmp);
}
-BOOL CD3DEngine::CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC)
+bool CD3DEngine::CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC)
{
return m_app->CreateBMPFile(pszFile, pbi, hBMP, hDC);
}
@@ -5377,28 +5377,28 @@ int CD3DEngine::RetKey(int keyRank, int option) // Use the joystick or keyboard.
-void CD3DEngine::SetJoystick(BOOL bEnable)
+void CD3DEngine::SetJoystick(bool bEnable)
{
m_app->SetJoystick(bEnable);
}
-BOOL CD3DEngine::RetJoystick()
+bool CD3DEngine::RetJoystick()
{
return m_app->RetJoystick();
}
-void CD3DEngine::SetDebugMode(BOOL bMode)
+void CD3DEngine::SetDebugMode(bool bMode)
{
m_app->SetDebugMode(bMode);
}
-BOOL CD3DEngine::RetDebugMode()
+bool CD3DEngine::RetDebugMode()
{
return m_app->RetDebugMode();
}
-BOOL CD3DEngine::RetSetupMode()
+bool CD3DEngine::RetSetupMode()
{
return m_app->RetSetupMode();
}
@@ -5406,7 +5406,7 @@ BOOL CD3DEngine::RetSetupMode() // Indicates whether a point is visible.
-BOOL CD3DEngine::IsVisiblePoint(const D3DVECTOR &pos)
+bool CD3DEngine::IsVisiblePoint(const D3DVECTOR &pos)
{
return ( Length(m_eyePt, pos) <= m_deepView[0] );
}
@@ -5417,8 +5417,8 @@ BOOL CD3DEngine::IsVisiblePoint(const D3DVECTOR &pos) HRESULT CD3DEngine::InitDeviceObjects()
{
// Set miscellaneous render states.
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_DITHERENABLE, TRUE);
- m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SPECULARENABLE, TRUE);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_DITHERENABLE, true);
+ m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SPECULARENABLE, true);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_SHADEMODE, D3DSHADE_GOURAUD);
m_pD3DDevice->SetRenderState(D3DRENDERSTATE_FILLMODE, D3DFILL_SOLID);
@@ -5565,7 +5565,7 @@ D3DMouse CD3DEngine::RetMouseType() return m_mouseType;
}
-void CD3DEngine::SetMouseHide(BOOL bHide)
+void CD3DEngine::SetMouseHide(bool bHide)
{
if ( m_bMouseHide == bHide ) return;
@@ -5574,36 +5574,36 @@ void CD3DEngine::SetMouseHide(BOOL bHide) m_bNiceMouse = m_app->RetNiceMouse();
if ( !m_bNiceMouse )
{
- m_app->SetNiceMouse(TRUE);
+ m_app->SetNiceMouse(true);
}
- m_bMouseHide = TRUE;
+ m_bMouseHide = true;
}
else // shows the mouse?
{
if ( !m_bNiceMouse )
{
- m_app->SetNiceMouse(FALSE);
+ m_app->SetNiceMouse(false);
}
- m_bMouseHide = FALSE;
+ m_bMouseHide = false;
}
}
-BOOL CD3DEngine::RetMouseHide()
+bool CD3DEngine::RetMouseHide()
{
return m_bMouseHide;
}
-void CD3DEngine::SetNiceMouse(BOOL bNice)
+void CD3DEngine::SetNiceMouse(bool bNice)
{
m_app->SetNiceMouse(bNice);
}
-BOOL CD3DEngine::RetNiceMouse()
+bool CD3DEngine::RetNiceMouse()
{
return m_app->RetNiceMouse();
}
-BOOL CD3DEngine::RetNiceMouseCap()
+bool CD3DEngine::RetNiceMouseCap()
{
return m_app->RetNiceMouseCap();
}
diff --git a/src/graphics/d3d/d3dengine.h b/src/graphics/d3d/d3dengine.h index 12e0fdb..ca821aa 100644 --- a/src/graphics/d3d/d3dengine.h +++ b/src/graphics/d3d/d3dengine.h @@ -188,10 +188,10 @@ D3DObjLevel1; typedef struct
{
- char bUsed; // TRUE -> object exists
- char bVisible; // TRUE -> visible object
- char bDrawWorld; // TRUE -> shape behind the interface
- char bDrawFront; // TRUE -> shape before the interface
+ char bUsed; // true -> object exists
+ char bVisible; // true -> visible object
+ char bDrawWorld; // true -> shape behind the interface
+ char bDrawFront; // true -> shape before the interface
int totalTriangle; // number of triangles used
D3DTypeObj type; // type of the object (TYPE*)
D3DMATRIX transform; // transformation matrix
@@ -206,8 +206,8 @@ D3DObject; typedef struct
{
- char bUsed; // TRUE -> object exists
- char bHide; // TRUE -> invisible shadow (object carried by ex.)
+ char bUsed; // true -> object exists
+ char bHide; // true -> invisible shadow (object carried by ex.)
int objRank; // rank of the object
D3DShadowType type; // type of shadow
D3DVECTOR pos; // position for the shadow
@@ -221,7 +221,7 @@ D3DShadow; typedef struct
{
- char bUsed; // TRUE -> object exists
+ char bUsed; // true -> object exists
D3DCOLORVALUE color; // color of the shadow
float min, max; // altitudes min / max
float smooth; // transition area
@@ -234,8 +234,8 @@ D3DGroundSpot; typedef struct
{
- char bUsed; // TRUE -> object exists
- char bDraw; // TRUE -> drawn mark
+ char bUsed; // true -> object exists
+ char bDraw; // true -> drawn mark
int phase; // 1 = increase, 2 = fixed, 3 = decrease
float delay[3]; // time for 3 phases
float fix; // fixed time
@@ -263,18 +263,18 @@ public: void SetTerrain(CTerrain* terrain);
- BOOL WriteProfile();
+ bool WriteProfile();
- void SetPause(BOOL bPause);
- BOOL RetPause();
+ void SetPause(bool bPause);
+ bool RetPause();
- void SetMovieLock(BOOL bLock);
- BOOL RetMovieLock();
+ void SetMovieLock(bool bLock);
+ bool RetMovieLock();
- void SetShowStat(BOOL bShow);
- BOOL RetShowStat();
+ void SetShowStat(bool bShow);
+ bool RetShowStat();
- void SetRenderEnable(BOOL bEnable);
+ void SetRenderEnable(bool bEnable);
HRESULT OneTimeSceneInit();
HRESULT InitDeviceObjects();
@@ -287,19 +287,19 @@ public: void AddStatisticTriangle(int nb);
int RetStatisticTriangle();
void SetHiliteRank(int *rankList);
- BOOL GetHilite(FPOINT &p1, FPOINT &p2);
- BOOL GetSpriteCoord(int &x, int &y);
+ bool GetHilite(FPOINT &p1, FPOINT &p2);
+ bool GetSpriteCoord(int &x, int &y);
void SetInfoText(int line, char* text);
char* RetInfoText(int line);
LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
- void FirstExecuteAdapt(BOOL bFirst);
+ void FirstExecuteAdapt(bool bFirst);
int GetVidMemTotal();
- BOOL IsVideo8MB();
- BOOL IsVideo32MB();
+ bool IsVideo8MB();
+ bool IsVideo32MB();
- BOOL EnumDevices(char *bufDevices, int lenDevices, char *bufModes, int lenModes, int &totalDevices, int &selectDevices, int &totalModes, int &selectModes);
- BOOL RetFullScreen();
- BOOL ChangeDevice(char *device, char *mode, BOOL bFull);
+ bool EnumDevices(char *bufDevices, int lenDevices, char *bufModes, int lenModes, int &totalDevices, int &selectDevices, int &totalModes, int &selectModes);
+ bool RetFullScreen();
+ bool ChangeDevice(char *device, char *mode, bool bFull);
D3DMATRIX* RetMatView();
D3DMATRIX* RetMatLeftView();
@@ -313,72 +313,72 @@ public: int RetRestCreate();
int CreateObject();
void FlushObject();
- BOOL DeleteObject(int objRank);
- BOOL SetDrawWorld(int objRank, BOOL bDraw);
- BOOL SetDrawFront(int objRank, BOOL bDraw);
- BOOL AddTriangle(int objRank, D3DVERTEX2* vertex, int nb, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max, BOOL bGlobalUpdate);
- BOOL AddSurface(int objRank, D3DVERTEX2* vertex, int nb, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max, BOOL bGlobalUpdate);
- BOOL AddQuick(int objRank, D3DObjLevel6* buffer, char* texName1, char* texName2, float min, float max, BOOL bGlobalUpdate);
+ bool DeleteObject(int objRank);
+ bool SetDrawWorld(int objRank, bool bDraw);
+ bool SetDrawFront(int objRank, bool bDraw);
+ bool AddTriangle(int objRank, D3DVERTEX2* vertex, int nb, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max, bool bGlobalUpdate);
+ bool AddSurface(int objRank, D3DVERTEX2* vertex, int nb, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max, bool bGlobalUpdate);
+ bool AddQuick(int objRank, D3DObjLevel6* buffer, char* texName1, char* texName2, float min, float max, bool bGlobalUpdate);
D3DObjLevel6* SearchTriangle(int objRank, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max);
void ChangeLOD();
- BOOL ChangeSecondTexture(int objRank, char* texName2);
+ bool ChangeSecondTexture(int objRank, char* texName2);
int RetTotalTriangles(int objRank);
int GetTriangles(int objRank, float min, float max, D3DTriangle* buffer, int size, float percent);
- BOOL GetBBox(int objRank, D3DVECTOR &min, D3DVECTOR &max);
- BOOL ChangeTextureMapping(int objRank, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max, D3DMaping mode, float au, float bu, float av, float bv);
- BOOL TrackTextureMapping(int objRank, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max, D3DMaping mode, float pos, float factor, float tl, float ts, float tt);
- BOOL SetObjectTransform(int objRank, const D3DMATRIX &transform);
- BOOL GetObjectTransform(int objRank, D3DMATRIX &transform);
- BOOL SetObjectType(int objRank, D3DTypeObj type);
+ bool GetBBox(int objRank, D3DVECTOR &min, D3DVECTOR &max);
+ bool ChangeTextureMapping(int objRank, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max, D3DMaping mode, float au, float bu, float av, float bv);
+ bool TrackTextureMapping(int objRank, const D3DMATERIAL7 &mat, int state, char* texName1, char* texName2, float min, float max, D3DMaping mode, float pos, float factor, float tl, float ts, float tt);
+ bool SetObjectTransform(int objRank, const D3DMATRIX &transform);
+ bool GetObjectTransform(int objRank, D3DMATRIX &transform);
+ bool SetObjectType(int objRank, D3DTypeObj type);
D3DTypeObj RetObjectType(int objRank);
- BOOL SetObjectTransparency(int objRank, float value);
+ bool SetObjectTransparency(int objRank, float value);
- BOOL ShadowCreate(int objRank);
+ bool ShadowCreate(int objRank);
void ShadowDelete(int objRank);
- BOOL SetObjectShadowHide(int objRank, BOOL bHide);
- BOOL SetObjectShadowType(int objRank, D3DShadowType type);
- BOOL SetObjectShadowPos(int objRank, const D3DVECTOR &pos);
- BOOL SetObjectShadowNormal(int objRank, const D3DVECTOR &n);
- BOOL SetObjectShadowAngle(int objRank, float angle);
- BOOL SetObjectShadowRadius(int objRank, float radius);
- BOOL SetObjectShadowIntensity(int objRank, float intensity);
- BOOL SetObjectShadowHeight(int objRank, float h);
+ bool SetObjectShadowHide(int objRank, bool bHide);
+ bool SetObjectShadowType(int objRank, D3DShadowType type);
+ bool SetObjectShadowPos(int objRank, const D3DVECTOR &pos);
+ bool SetObjectShadowNormal(int objRank, const D3DVECTOR &n);
+ bool SetObjectShadowAngle(int objRank, float angle);
+ bool SetObjectShadowRadius(int objRank, float radius);
+ bool SetObjectShadowIntensity(int objRank, float intensity);
+ bool SetObjectShadowHeight(int objRank, float h);
float RetObjectShadowRadius(int objRank);
void GroundSpotFlush();
int GroundSpotCreate();
void GroundSpotDelete(int rank);
- BOOL SetObjectGroundSpotPos(int rank, const D3DVECTOR &pos);
- BOOL SetObjectGroundSpotRadius(int rank, float radius);
- BOOL SetObjectGroundSpotColor(int rank, D3DCOLORVALUE color);
- BOOL SetObjectGroundSpotMinMax(int rank, float min, float max);
- BOOL SetObjectGroundSpotSmooth(int rank, float smooth);
+ bool SetObjectGroundSpotPos(int rank, const D3DVECTOR &pos);
+ bool SetObjectGroundSpotRadius(int rank, float radius);
+ bool SetObjectGroundSpotColor(int rank, D3DCOLORVALUE color);
+ bool SetObjectGroundSpotMinMax(int rank, float min, float max);
+ bool SetObjectGroundSpotSmooth(int rank, float smooth);
int GroundMarkCreate(D3DVECTOR pos, float radius, float delay1, float delay2, float delay3, int dx, int dy, char* table);
- BOOL GroundMarkDelete(int rank);
+ bool GroundMarkDelete(int rank);
void Update();
void SetViewParams(const D3DVECTOR &vEyePt, const D3DVECTOR &vLookatPt, const D3DVECTOR &vUpVec, FLOAT fEyeDistance);
- BOOL FreeTexture(char* name);
- BOOL LoadTexture(char* name, int stage=0);
- BOOL LoadAllTexture();
+ bool FreeTexture(char* name);
+ bool LoadTexture(char* name, int stage=0);
+ bool LoadAllTexture();
void SetLimitLOD(int rank, float limit);
- float RetLimitLOD(int rank, BOOL bLast=FALSE);
+ float RetLimitLOD(int rank, bool bLast=false);
void SetTerrainVision(float vision);
- void SetGroundSpot(BOOL bMode);
- BOOL RetGroundSpot();
- void SetShadow(BOOL bMode);
- BOOL RetShadow();
- void SetDirty(BOOL bMode);
- BOOL RetDirty();
- void SetFog(BOOL bMode);
- BOOL RetFog();
- BOOL RetStateColor();
+ void SetGroundSpot(bool bMode);
+ bool RetGroundSpot();
+ void SetShadow(bool bMode);
+ bool RetShadow();
+ void SetDirty(bool bMode);
+ bool RetDirty();
+ void SetFog(bool bMode);
+ bool RetFog();
+ bool RetStateColor();
void SetSecondTexture(int texNum);
int RetSecondTexture();
@@ -386,8 +386,8 @@ public: void SetRankView(int rank);
int RetRankView();
- void SetDrawWorld(BOOL bDraw);
- void SetDrawFront(BOOL bDraw);
+ void SetDrawWorld(bool bDraw);
+ void SetDrawFront(bool bDraw);
void SetAmbiantColor(D3DCOLOR color, int rank=0);
D3DCOLOR RetAmbiantColor(int rank=0);
@@ -398,16 +398,16 @@ public: void SetFogColor(D3DCOLOR color, int rank=0);
D3DCOLOR RetFogColor(int rank=0);
- void SetDeepView(float length, int rank=0, BOOL bRef=FALSE);
+ void SetDeepView(float length, int rank=0, bool bRef=false);
float RetDeepView(int rank=0);
void SetFogStart(float start, int rank=0);
float RetFogStart(int rank=0);
- void SetBackground(char *name, D3DCOLOR up=0, D3DCOLOR down=0, D3DCOLOR cloudUp=0, D3DCOLOR cloudDown=0, BOOL bFull=FALSE, BOOL bQuarter=FALSE);
- void RetBackground(char *name, D3DCOLOR &up, D3DCOLOR &down, D3DCOLOR &cloudUp, D3DCOLOR &cloudDown, BOOL &bFull, BOOL &bQuarter);
+ void SetBackground(char *name, D3DCOLOR up=0, D3DCOLOR down=0, D3DCOLOR cloudUp=0, D3DCOLOR cloudDown=0, bool bFull=false, bool bQuarter=false);
+ void RetBackground(char *name, D3DCOLOR &up, D3DCOLOR &down, D3DCOLOR &cloudUp, D3DCOLOR &cloudDown, bool &bFull, bool &bQuarter);
void SetFrontsizeName(char *name);
- void SetOverFront(BOOL bFront);
+ void SetOverFront(bool bFront);
void SetOverColor(D3DCOLOR color=0, int mode=D3DSTATETCb);
void SetParticuleDensity(float value);
@@ -426,32 +426,32 @@ public: void SetTextureQuality(int value);
int RetTextureQuality();
- void SetTotoMode(BOOL bPresent);
- BOOL RetTotoMode();
+ void SetTotoMode(bool bPresent);
+ bool RetTotoMode();
- void SetLensMode(BOOL bPresent);
- BOOL RetLensMode();
+ void SetLensMode(bool bPresent);
+ bool RetLensMode();
- void SetWaterMode(BOOL bPresent);
- BOOL RetWaterMode();
+ void SetWaterMode(bool bPresent);
+ bool RetWaterMode();
- void SetBlitzMode(BOOL bPresent);
- BOOL RetBlitzMode();
+ void SetBlitzMode(bool bPresent);
+ bool RetBlitzMode();
- void SetSkyMode(BOOL bPresent);
- BOOL RetSkyMode();
+ void SetSkyMode(bool bPresent);
+ bool RetSkyMode();
- void SetBackForce(BOOL bPresent);
- BOOL RetBackForce();
+ void SetBackForce(bool bPresent);
+ bool RetBackForce();
- void SetPlanetMode(BOOL bPresent);
- BOOL RetPlanetMode();
+ void SetPlanetMode(bool bPresent);
+ bool RetPlanetMode();
- void SetLightMode(BOOL bPresent);
- BOOL RetLightMode();
+ void SetLightMode(bool bPresent);
+ bool RetLightMode();
- void SetEditIndentMode(BOOL bAuto);
- BOOL RetEditIndentMode();
+ void SetEditIndentMode(bool bAuto);
+ bool RetEditIndentMode();
void SetEditIndentValue(int value);
int RetEditIndentValue();
@@ -478,14 +478,14 @@ public: void SetKey(int keyRank, int option, int key);
int RetKey(int keyRank, int option);
- void SetJoystick(BOOL bEnable);
- BOOL RetJoystick();
+ void SetJoystick(bool bEnable);
+ bool RetJoystick();
- void SetDebugMode(BOOL bMode);
- BOOL RetDebugMode();
- BOOL RetSetupMode();
+ void SetDebugMode(bool bMode);
+ bool RetDebugMode();
+ bool RetSetupMode();
- BOOL IsVisiblePoint(const D3DVECTOR &pos);
+ bool IsVisiblePoint(const D3DVECTOR &pos);
int DetectObject(FPOINT mouse);
void SetState(int state, D3DCOLOR color=0xffffffff);
@@ -497,26 +497,26 @@ public: FPOINT RetMousePos();
void SetMouseType(D3DMouse type);
D3DMouse RetMouseType();
- void SetMouseHide(BOOL bHide);
- BOOL RetMouseHide();
- void SetNiceMouse(BOOL bNice);
- BOOL RetNiceMouse();
- BOOL RetNiceMouseCap();
+ void SetMouseHide(bool bHide);
+ bool RetMouseHide();
+ void SetNiceMouse(bool bNice);
+ bool RetNiceMouse();
+ bool RetNiceMouseCap();
CText* RetText();
- BOOL ChangeColor(char *name, D3DCOLORVALUE colorRef1, D3DCOLORVALUE colorNew1, D3DCOLORVALUE colorRef2, D3DCOLORVALUE colorNew2, float tolerance1, float tolerance2, FPOINT ts, FPOINT ti, FPOINT *pExclu=0, float shift=0.0f, BOOL bHSV=FALSE);
- BOOL OpenImage(char *name);
- BOOL CopyImage();
- BOOL LoadImage();
- BOOL ScrollImage(int dx, int dy);
- BOOL SetDot(int x, int y, D3DCOLORVALUE color);
- BOOL CloseImage();
- BOOL WriteScreenShot(char *filename, int width, int height);
- BOOL GetRenderDC(HDC &hDC);
- BOOL ReleaseRenderDC(HDC &hDC);
+ bool ChangeColor(char *name, D3DCOLORVALUE colorRef1, D3DCOLORVALUE colorNew1, D3DCOLORVALUE colorRef2, D3DCOLORVALUE colorNew2, float tolerance1, float tolerance2, FPOINT ts, FPOINT ti, FPOINT *pExclu=0, float shift=0.0f, bool bHSV=false);
+ bool OpenImage(char *name);
+ bool CopyImage();
+ bool LoadImage();
+ bool ScrollImage(int dx, int dy);
+ bool SetDot(int x, int y, D3DCOLORVALUE color);
+ bool CloseImage();
+ bool WriteScreenShot(char *filename, int width, int height);
+ bool GetRenderDC(HDC &hDC);
+ bool ReleaseRenderDC(HDC &hDC);
PBITMAPINFO CreateBitmapInfoStruct(HBITMAP hBmp);
- BOOL CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC);
+ bool CreateBMPFile(LPTSTR pszFile, PBITMAPINFO pbi, HBITMAP hBMP, HDC hDC);
protected:
void MemSpace1(D3DObjLevel1 *&p, int nb);
@@ -532,10 +532,10 @@ protected: D3DObjLevel5* AddLevel4(D3DObjLevel4 *&p4, int reserve);
D3DObjLevel6* AddLevel5(D3DObjLevel5 *&p5, D3DTypeTri type, const D3DMATERIAL7 &mat, int state, int nb);
- BOOL IsVisible(int objRank);
- BOOL DetectBBox(int objRank, FPOINT mouse);
- BOOL DetectTriangle(FPOINT mouse, D3DVERTEX2 *triangle, int objRank, float &dist);
- BOOL TransformPoint(D3DVECTOR &p2D, int objRank, D3DVECTOR p3D);
+ bool IsVisible(int objRank);
+ bool DetectBBox(int objRank, FPOINT mouse);
+ bool DetectTriangle(FPOINT mouse, D3DVERTEX2 *triangle, int objRank, float &dist);
+ bool TransformPoint(D3DVECTOR &p2D, int objRank, D3DVECTOR p3D);
void ComputeDistance();
void UpdateGeometry();
void RenderGroundSpot();
@@ -547,7 +547,7 @@ protected: void DrawPlanet();
void DrawFrontsize();
void DrawOverColor();
- BOOL GetBBox2D(int objRank, FPOINT &min, FPOINT &max);
+ bool GetBBox2D(int objRank, FPOINT &min, FPOINT &max);
void DrawHilite();
void DrawMouse();
void DrawSprite(FPOINT pos, FPOINT dim, int icon);
@@ -590,9 +590,9 @@ protected: float m_absTime;
float m_lastTime;
float m_speed;
- BOOL m_bPause;
- BOOL m_bRender;
- BOOL m_bMovieLock;
+ bool m_bPause;
+ bool m_bRender;
+ bool m_bMovieLock;
POINT m_dim;
POINT m_lastDim;
@@ -615,30 +615,30 @@ protected: float m_fogStart[2];
D3DCOLORVALUE m_waterAddColor;
int m_statisticTriangle;
- BOOL m_bUpdateGeometry;
+ bool m_bUpdateGeometry;
char m_infoText[10][200];
int m_alphaMode;
- BOOL m_bStateColor;
- BOOL m_bForceStateColor;
- BOOL m_bGroundSpot;
- BOOL m_bShadow;
- BOOL m_bDirty;
- BOOL m_bFog;
- BOOL m_bFirstGroundSpot;
+ bool m_bStateColor;
+ bool m_bForceStateColor;
+ bool m_bGroundSpot;
+ bool m_bShadow;
+ bool m_bDirty;
+ bool m_bFog;
+ bool m_bFirstGroundSpot;
int m_secondTexNum;
char m_backgroundName[50];
D3DCOLOR m_backgroundColorUp;
D3DCOLOR m_backgroundColorDown;
D3DCOLOR m_backgroundCloudUp;
D3DCOLOR m_backgroundCloudDown;
- BOOL m_bBackgroundFull;
- BOOL m_bBackgroundQuarter;
- BOOL m_bOverFront;
+ bool m_bBackgroundFull;
+ bool m_bBackgroundQuarter;
+ bool m_bOverFront;
D3DCOLOR m_overColor;
int m_overMode;
char m_frontsizeName[50];
- BOOL m_bDrawWorld;
- BOOL m_bDrawFront;
+ bool m_bDrawWorld;
+ bool m_bDrawFront;
float m_limitLOD[2];
float m_particuleDensity;
float m_clippingDistance;
@@ -648,19 +648,19 @@ protected: float m_terrainVision;
float m_gadgetQuantity;
int m_textureQuality;
- BOOL m_bTotoMode;
- BOOL m_bLensMode;
- BOOL m_bWaterMode;
- BOOL m_bSkyMode;
- BOOL m_bBackForce;
- BOOL m_bPlanetMode;
- BOOL m_bLightMode;
- BOOL m_bEditIndentMode;
+ bool m_bTotoMode;
+ bool m_bLensMode;
+ bool m_bWaterMode;
+ bool m_bSkyMode;
+ bool m_bBackForce;
+ bool m_bPlanetMode;
+ bool m_bLightMode;
+ bool m_bEditIndentMode;
int m_editIndentValue;
float m_tracePrecision;
int m_hiliteRank[100];
- BOOL m_bHilite;
+ bool m_bHilite;
FPOINT m_hiliteP1;
FPOINT m_hiliteP2;
@@ -671,8 +671,8 @@ protected: FPOINT m_mousePos;
D3DMouse m_mouseType;
- BOOL m_bMouseHide;
- BOOL m_bNiceMouse;
+ bool m_bMouseHide;
+ bool m_bNiceMouse;
LPDIRECTDRAWSURFACE7 m_imageSurface;
DDSURFACEDESC2 m_imageDDSD;
diff --git a/src/graphics/d3d/d3denum.cpp b/src/graphics/d3d/d3denum.cpp index c163bb8..82d79d9 100644 --- a/src/graphics/d3d/d3denum.cpp +++ b/src/graphics/d3d/d3denum.cpp @@ -144,7 +144,7 @@ static HRESULT WINAPI DeviceEnumCallback( TCHAR* strDesc, TCHAR* strName, //? if( strstr(strName, "T&L") != 0 ) return D3DENUMRET_OK;
// Avoid duplicates: only enum HW devices for secondary DDraw drivers.
- if( NULL != pDeviceInfo->pDriverGUID && FALSE == pDeviceInfo->bHardware )
+ if( NULL != pDeviceInfo->pDriverGUID && false == pDeviceInfo->bHardware )
return D3DENUMRET_OK;
// Give the app a chance to accept or reject this device.
@@ -170,7 +170,7 @@ static HRESULT WINAPI DeviceEnumCallback( TCHAR* strDesc, TCHAR* strName, // Record whether the device has any stereo modes
if( ddsdMode.ddsCaps.dwCaps2 & DDSCAPS2_STEREOSURFACELEFT )
- pDeviceInfo->bStereoCompatible = TRUE;
+ pDeviceInfo->bStereoCompatible = true;
}
}
@@ -206,7 +206,7 @@ static HRESULT WINAPI DeviceEnumCallback( TCHAR* strDesc, TCHAR* strName, // Name: DriverEnumCallback()
// Desc: Callback function for enumerating drivers.
//-----------------------------------------------------------------------------
-static BOOL WINAPI DriverEnumCallback( GUID* pGUID, TCHAR* strDesc,
+static bool WINAPI DriverEnumCallback( GUID* pGUID, TCHAR* strDesc,
TCHAR* strName, VOID*, HMONITOR )
{
D3DEnum_DeviceInfo d3dDeviceInfo;
@@ -246,7 +246,7 @@ static BOOL WINAPI DriverEnumCallback( GUID* pGUID, TCHAR* strDesc, // Record whether the device can render into a desktop window
if( d3dDeviceInfo.ddDriverCaps.dwCaps2 & DDCAPS2_CANRENDERWINDOWED )
if( NULL == d3dDeviceInfo.pDriverGUID )
- d3dDeviceInfo.bDesktopCompatible = TRUE;
+ d3dDeviceInfo.bDesktopCompatible = true;
// Enumerate the fullscreen display modes.
pDD->EnumDisplayModes( 0, NULL, &d3dDeviceInfo, ModeEnumCallback );
@@ -341,8 +341,8 @@ VOID D3DEnum_GetDevices( D3DEnum_DeviceInfo** ppDevices, DWORD* pdwCount ) // select dialog box.
//-----------------------------------------------------------------------------
static VOID UpdateDialogControls( HWND hDlg, D3DEnum_DeviceInfo* pCurrentDevice,
- DWORD dwCurrentMode, BOOL bWindowed,
- BOOL bStereo )
+ DWORD dwCurrentMode, bool bWindowed,
+ bool bStereo )
{
// Get access to the enumerated device list
D3DEnum_DeviceInfo* pDeviceList;
@@ -361,8 +361,8 @@ static VOID UpdateDialogControls( HWND hDlg, D3DEnum_DeviceInfo* pCurrentDevice, ComboBox_ResetContent( hwndMode );
// Don't let non-GDI devices be windowed
- if( FALSE == pCurrentDevice->bDesktopCompatible )
- bWindowed = FALSE;
+ if( false == pCurrentDevice->bDesktopCompatible )
+ bWindowed = false;
// Add a list of devices to the device combo box
for( DWORD device = 0; device < dwNumDevices; device++ )
@@ -443,8 +443,8 @@ static INT_PTR CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam, static D3DEnum_DeviceInfo** ppDeviceArg;
static D3DEnum_DeviceInfo* pCurrentDevice;
static DWORD dwCurrentMode;
- static BOOL bCurrentWindowed;
- static BOOL bCurrentStereo;
+ static bool bCurrentWindowed;
+ static bool bCurrentStereo;
// Get access to the enumerated device list
D3DEnum_DeviceInfo* pDeviceList;
@@ -457,7 +457,7 @@ static INT_PTR CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam, // Get the app's current device, passed in as an lParam argument
ppDeviceArg = (D3DEnum_DeviceInfo**)lParam;
if( NULL == ppDeviceArg )
- return FALSE;
+ return false;
// Setup temp storage pointers for dialog
pCurrentDevice = (*ppDeviceArg);
@@ -468,7 +468,7 @@ static INT_PTR CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam, UpdateDialogControls( hDlg, pCurrentDevice, dwCurrentMode,
bCurrentWindowed, bCurrentStereo );
- return TRUE;
+ return true;
}
else if( WM_COMMAND == uiMsg )
{
@@ -481,8 +481,8 @@ static INT_PTR CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam, DWORD dwDevice = ComboBox_GetCurSel( hwndDevice );
DWORD dwModeItem = ComboBox_GetCurSel( hwndMode );
DWORD dwMode = ComboBox_GetItemData( hwndMode, dwModeItem );
- BOOL bWindowed = hwndWindowed ? Button_GetCheck( hwndWindowed ) : 0;
- BOOL bStereo = hwndStereo ? Button_GetCheck( hwndStereo ) : 0;
+ bool bWindowed = hwndWindowed ? Button_GetCheck( hwndWindowed ) : 0;
+ bool bStereo = hwndStereo ? Button_GetCheck( hwndStereo ) : 0;
D3DEnum_DeviceInfo* pDevice = &pDeviceList[dwDevice];
@@ -505,13 +505,13 @@ static INT_PTR CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam, else
EndDialog( hDlg, IDCANCEL );
- return TRUE;
+ return true;
}
else if( IDCANCEL == LOWORD(wParam) )
{
// Handle the case when the user hits the Cancel button
EndDialog( hDlg, IDCANCEL );
- return TRUE;
+ return true;
}
else if( CBN_SELENDOK == HIWORD(wParam) )
{
@@ -526,10 +526,10 @@ static INT_PTR CALLBACK ChangeDeviceProc( HWND hDlg, UINT uiMsg, WPARAM wParam, // Keep the UI current
UpdateDialogControls( hDlg, &pDeviceList[dwDevice], dwMode, bWindowed, bStereo );
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
@@ -610,7 +610,7 @@ HRESULT D3DEnum_SelectDefaultDevice( D3DEnum_DeviceInfo** ppDevice, return D3DENUMERR_NOCOMPATIBLEDEVICES;
// Set the windowed state of the newly selected device
- (*ppDevice)->bWindowed = TRUE;
+ (*ppDevice)->bWindowed = true;
return S_OK;
}
diff --git a/src/graphics/d3d/d3denum.h b/src/graphics/d3d/d3denum.h index 0086d57..4f1edfc 100644 --- a/src/graphics/d3d/d3denum.h +++ b/src/graphics/d3d/d3denum.h @@ -53,7 +53,7 @@ struct D3DEnum_DeviceInfo TCHAR strDesc[40];
GUID* pDeviceGUID;
D3DDEVICEDESC7 ddDeviceDesc;
- BOOL bHardware;
+ bool bHardware;
// DDraw Driver info
GUID* pDriverGUID;
@@ -62,8 +62,8 @@ struct D3DEnum_DeviceInfo // DDraw Mode Info
DDSURFACEDESC2 ddsdFullscreenMode;
- BOOL bWindowed;
- BOOL bStereo;
+ bool bWindowed;
+ bool bStereo;
// For internal use (apps should not need to use these)
GUID guidDevice;
@@ -71,8 +71,8 @@ struct D3DEnum_DeviceInfo DDSURFACEDESC2* pddsdModes;
DWORD dwNumModes;
DWORD dwCurrentMode;
- BOOL bDesktopCompatible;
- BOOL bStereoCompatible;
+ bool bDesktopCompatible;
+ bool bStereoCompatible;
};
diff --git a/src/graphics/d3d/d3dframe.cpp b/src/graphics/d3d/d3dframe.cpp index 73c0569..489e739 100644 --- a/src/graphics/d3d/d3dframe.cpp +++ b/src/graphics/d3d/d3dframe.cpp @@ -38,8 +38,8 @@ CD3DFramework7::CD3DFramework7()
{
m_hWnd = NULL;
- m_bIsFullscreen = FALSE;
- m_bIsStereo = FALSE;
+ m_bIsFullscreen = false;
+ m_bIsStereo = false;
m_dwRenderWidth = 0L;
m_dwRenderHeight = 0L;
@@ -131,13 +131,13 @@ HRESULT CD3DFramework7::Initialize( HWND hWnd, GUID* pDriverGUID, // Setup state for windowed/fullscreen mode
m_hWnd = hWnd;
- m_bIsStereo = FALSE;
- m_bIsFullscreen = ( dwFlags & D3DFW_FULLSCREEN ) ? TRUE : FALSE;
+ m_bIsStereo = false;
+ m_bIsFullscreen = ( dwFlags & D3DFW_FULLSCREEN ) ? true : false;
// Support stereoscopic viewing for fullscreen modes which support it
if( ( dwFlags & D3DFW_STEREO ) && ( dwFlags & D3DFW_FULLSCREEN ) )
if( pMode->ddsCaps.dwCaps2 & DDSCAPS2_STEREOSURFACELEFT )
- m_bIsStereo = TRUE;
+ m_bIsStereo = true;
// Create the D3D rendering environment (surfaces, device, viewport, etc.)
if( FAILED( hr = CreateEnvironment( pDriverGUID, pDeviceGUID, pMode,
@@ -561,7 +561,7 @@ HRESULT CD3DFramework7::RestoreSurfaces() //-----------------------------------------------------------------------------
VOID CD3DFramework7::Move( INT x, INT y )
{
- if( TRUE == m_bIsFullscreen )
+ if( true == m_bIsFullscreen )
return;
SetRect( &m_rcScreenRect, x, y, x + m_dwRenderWidth, y + m_dwRenderHeight );
@@ -575,7 +575,7 @@ VOID CD3DFramework7::Move( INT x, INT y ) // Desc: Puts the GDI surface in front of the primary, so that dialog
// boxes and other windows drawing funcs may happen.
//-----------------------------------------------------------------------------
-HRESULT CD3DFramework7::FlipToGDISurface( BOOL bDrawFrame )
+HRESULT CD3DFramework7::FlipToGDISurface( bool bDrawFrame )
{
if( m_pDD && m_bIsFullscreen )
{
diff --git a/src/graphics/d3d/d3dframe.h b/src/graphics/d3d/d3dframe.h index 2a6f902..1c02e04 100644 --- a/src/graphics/d3d/d3dframe.h +++ b/src/graphics/d3d/d3dframe.h @@ -52,8 +52,8 @@ class CD3DFramework7 {
// Internal variables for the framework class
HWND m_hWnd; // The window object
- BOOL m_bIsFullscreen; // Fullscreen vs. windowed
- BOOL m_bIsStereo; // Stereo view mode
+ bool m_bIsFullscreen; // Fullscreen vs. windowed
+ bool m_bIsStereo; // Stereo view mode
DWORD m_dwRenderWidth; // Dimensions of the render target
DWORD m_dwRenderHeight;
RECT m_rcScreenRect; // Screen rect for window
@@ -87,11 +87,11 @@ public: // Functions to aid rendering
HRESULT RestoreSurfaces();
HRESULT ShowFrame();
- HRESULT FlipToGDISurface( BOOL bDrawFrame = FALSE );
+ HRESULT FlipToGDISurface( bool bDrawFrame = false );
// Functions for managing screen and viewport bounds
- BOOL IsFullscreen() { return m_bIsFullscreen; }
- BOOL IsStereo() { return m_bIsStereo; }
+ bool IsFullscreen() { return m_bIsFullscreen; }
+ bool IsStereo() { return m_bIsStereo; }
VOID Move( INT x, INT y );
// Creates the Framework
diff --git a/src/graphics/d3d/d3dtextr.cpp b/src/graphics/d3d/d3dtextr.cpp index 6122029..9b82410 100644 --- a/src/graphics/d3d/d3dtextr.cpp +++ b/src/graphics/d3d/d3dtextr.cpp @@ -41,11 +41,11 @@ // Macros, function prototypes and static variable
//-----------------------------------------------------------------------------
static TCHAR g_strTexturePath[512] = _T(""); // Path for files
-static BOOL g_bDebugMode = FALSE;
+static bool g_bDebugMode = false;
-void D3DTextr_SetDebugMode(BOOL bDebug)
+void D3DTextr_SetDebugMode(bool bDebug)
{
g_bDebugMode = bDebug;
}
@@ -66,7 +66,7 @@ struct TextureContainer DWORD m_dwStage; // Texture stage (for multitexture devices)
DWORD m_dwBPP;
DWORD m_dwFlags;
- BOOL m_bHasAlpha;
+ bool m_bHasAlpha;
LPDIRECTDRAWSURFACE7 m_pddsSurface; // Surface of the texture
HBITMAP m_hbmBitmap; // Bitmap containing texture image
@@ -115,9 +115,9 @@ CD3DTextureManager g_StaticTextureEngine; struct TEXTURESEARCHINFO
{
DWORD dwDesiredBPP; // Input for texture format search
- BOOL bUseAlpha;
- BOOL bUsePalette;
- BOOL bFoundGoodFormat;
+ bool bUseAlpha;
+ bool bUsePalette;
+ bool bFoundGoodFormat;
DDPIXELFORMAT* pddpf; // Output of texture format search
};
@@ -152,7 +152,7 @@ static HRESULT CALLBACK TextureSearchCallback( DDPIXELFORMAT* pddpf, // Accept the first 8-bit palettized format we get
memcpy( ptsi->pddpf, pddpf, sizeof(DDPIXELFORMAT) );
- ptsi->bFoundGoodFormat = TRUE;
+ ptsi->bFoundGoodFormat = true;
return DDENUMRET_CANCEL;
}
@@ -170,16 +170,16 @@ static HRESULT CALLBACK TextureSearchCallback( DDPIXELFORMAT* pddpf, return DDENUMRET_OK;
// Make sure current alpha format agrees with requested format type
- if( (ptsi->bUseAlpha==TRUE) && !(pddpf->dwFlags&DDPF_ALPHAPIXELS) )
+ if( (ptsi->bUseAlpha==true) && !(pddpf->dwFlags&DDPF_ALPHAPIXELS) )
return DDENUMRET_OK;
- if( (ptsi->bUseAlpha==FALSE) && (pddpf->dwFlags&DDPF_ALPHAPIXELS) )
+ if( (ptsi->bUseAlpha==false) && (pddpf->dwFlags&DDPF_ALPHAPIXELS) )
return DDENUMRET_OK;
// Check if we found a good match
if( pddpf->dwRGBBitCount == ptsi->dwDesiredBPP )
{
memcpy( ptsi->pddpf, pddpf, sizeof(DDPIXELFORMAT) );
- ptsi->bFoundGoodFormat = TRUE;
+ ptsi->bFoundGoodFormat = true;
return DDENUMRET_CANCEL;
}
@@ -473,7 +473,7 @@ HRESULT TextureContainer::LoadTargaFile( TCHAR* strMetaname, TCHAR* strFilename //? if( m_pRGBAData[i] & 0x000000ff != 0xff )
if( (m_pRGBAData[i] & 0x000000ff) != 0xff ) // erreur corrig�e !
{
- m_bHasAlpha = TRUE;
+ m_bHasAlpha = true;
break;
}
}
@@ -542,7 +542,7 @@ HRESULT TextureContainer::Restore( LPDIRECT3DDEVICE7 pd3dDevice ) // Setup the structure to be used for texture enumration.
TEXTURESEARCHINFO tsi;
- tsi.bFoundGoodFormat = FALSE;
+ tsi.bFoundGoodFormat = false;
tsi.pddpf = &ddsd.ddpfPixelFormat;
tsi.dwDesiredBPP = m_dwBPP;
tsi.bUsePalette = ( m_dwBPP <= 8 );
@@ -558,13 +558,13 @@ HRESULT TextureContainer::Restore( LPDIRECT3DDEVICE7 pd3dDevice ) {
if( ddDesc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_ALPHAPALETTE )
{
- tsi.bUseAlpha = TRUE;
- tsi.bUsePalette = TRUE;
+ tsi.bUseAlpha = true;
+ tsi.bUsePalette = true;
}
else
{
- tsi.bUseAlpha = TRUE;
- tsi.bUsePalette = FALSE;
+ tsi.bUseAlpha = true;
+ tsi.bUsePalette = false;
}
}
}
@@ -574,14 +574,14 @@ HRESULT TextureContainer::Restore( LPDIRECT3DDEVICE7 pd3dDevice ) pd3dDevice->EnumTextureFormats( TextureSearchCallback, &tsi );
// If we couldn't find a format, let's try a default format
- if( FALSE == tsi.bFoundGoodFormat )
+ if( false == tsi.bFoundGoodFormat )
{
- tsi.bUsePalette = FALSE;
+ tsi.bUsePalette = false;
tsi.dwDesiredBPP = 16;
pd3dDevice->EnumTextureFormats( TextureSearchCallback, &tsi );
// If we still fail, we cannot create this texture
- if( FALSE == tsi.bFoundGoodFormat )
+ if( false == tsi.bFoundGoodFormat )
return E_FAIL;
}
@@ -960,7 +960,7 @@ HRESULT D3DTextr_CreateEmptyTexture( TCHAR* strName, DWORD dwWidth, // Save alpha usage flag
if( dwFlags & D3DTEXTR_CREATEWITHALPHA )
- ptcTexture->m_bHasAlpha = TRUE;
+ ptcTexture->m_bHasAlpha = true;
return S_OK;
}
diff --git a/src/graphics/d3d/d3dtextr.h b/src/graphics/d3d/d3dtextr.h index 0e43fd2..842fa58 100644 --- a/src/graphics/d3d/d3dtextr.h +++ b/src/graphics/d3d/d3dtextr.h @@ -74,6 +74,6 @@ HRESULT D3DTextr_CreateEmptyTexture( TCHAR* strName, DWORD dwWidth, HRESULT D3DTextr_DestroyTexture( TCHAR* strName );
VOID D3DTextr_SetTexturePath( TCHAR* strTexturePath );
-void D3DTextr_SetDebugMode(BOOL bDebug);
+void D3DTextr_SetDebugMode(bool bDebug);
diff --git a/src/math/old/d3dmath.h b/src/math/old/d3dmath.h index 4f563e7..0cab192 100644 --- a/src/math/old/d3dmath.h +++ b/src/math/old/d3dmath.h @@ -47,7 +47,7 @@ const FLOAT g_EPSILON = 1.0e-5f; // Tolerance for FLOATs //-----------------------------------------------------------------------------
// Fuzzy compares (within tolerance)
//-----------------------------------------------------------------------------
-inline BOOL D3DMath_IsZero( FLOAT a, FLOAT fTol = g_EPSILON )
+inline bool D3DMath_IsZero( FLOAT a, FLOAT fTol = g_EPSILON )
{ return ( a <= 0.0f ) ? ( a >= -fTol ) : ( a <= fTol ); }
diff --git a/src/math/old/math3d.cpp b/src/math/old/math3d.cpp index 368cd5e..ad380af 100644 --- a/src/math/old/math3d.cpp +++ b/src/math/old/math3d.cpp @@ -31,9 +31,9 @@ -// Returns TRUE if two numbers are nearly equal.
+// Returns true if two numbers are nearly equal.
-BOOL IsEqual(float a, float b)
+bool IsEqual(float a, float b)
{
return Abs(a-b) < CHOUIA;
}
@@ -164,7 +164,7 @@ float NormAngle(float angle) // Test if a angle is between two terminals.
-BOOL TestAngle(float angle, float min, float max)
+bool TestAngle(float angle, float min, float max)
{
angle = NormAngle(angle);
min = NormAngle(min);
@@ -364,14 +364,14 @@ D3DVECTOR SegmentDist(const D3DVECTOR &p1, const D3DVECTOR &p2, float dist) // Check if a point is inside a triangle.
-BOOL IsInsideTriangle(FPOINT a, FPOINT b, FPOINT c, FPOINT p)
+bool IsInsideTriangle(FPOINT a, FPOINT b, FPOINT c, FPOINT p)
{
float n, m;
- if ( p.x < a.x && p.x < b.x && p.x < c.x ) return FALSE;
- if ( p.x > a.x && p.x > b.x && p.x > c.x ) return FALSE;
- if ( p.y < a.y && p.y < b.y && p.y < c.y ) return FALSE;
- if ( p.y > a.y && p.y > b.y && p.y > c.y ) return FALSE;
+ if ( p.x < a.x && p.x < b.x && p.x < c.x ) return false;
+ if ( p.x > a.x && p.x > b.x && p.x > c.x ) return false;
+ if ( p.y < a.y && p.y < b.y && p.y < c.y ) return false;
+ if ( p.y > a.y && p.y > b.y && p.y > c.y ) return false;
if ( a.x > b.x ) Swap(a,b);
if ( a.x > c.x ) Swap(a,c);
@@ -380,18 +380,18 @@ BOOL IsInsideTriangle(FPOINT a, FPOINT b, FPOINT c, FPOINT p) n = MidPoint(a, b, p.x);
m = MidPoint(a, c, p.x);
- if ( (n>p.y||p.y>m) && (n<p.y||p.y<m) ) return FALSE;
+ if ( (n>p.y||p.y>m) && (n<p.y||p.y<m) ) return false;
n = MidPoint(c, b, p.x);
m = MidPoint(c, a, p.x);
- if ( (n>p.y||p.y>m) && (n<p.y||p.y<m) ) return FALSE;
+ if ( (n>p.y||p.y>m) && (n<p.y||p.y<m) ) return false;
- return TRUE;
+ return true;
}
// Calculates the intersection "i" right "of" the plan "abc".
-BOOL Intersect(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c,
+bool Intersect(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c,
D3DVECTOR d, D3DVECTOR e, D3DVECTOR &i)
{
float d1, d2;
@@ -404,18 +404,18 @@ BOOL Intersect(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, (d.y-e.y)*((b.x-a.x)*(c.z-a.z)-(c.x-a.x)*(b.z-a.z)) +
(d.z-e.z)*((b.x-a.x)*(c.y-a.y)-(c.x-a.x)*(b.y-a.y));
- if ( d2 == 0 ) return FALSE;
+ if ( d2 == 0 ) return false;
i.x = d.x + d1/d2*(e.x-d.x);
i.y = d.y + d1/d2*(e.y-d.y);
i.z = d.z + d1/d2*(e.z-d.z);
- return TRUE;
+ return true;
}
// Calculates the intersection of the straight line passing through p (x, z)
// parallel to the y axis, with the plane abc. Returns p.y.
-BOOL IntersectY(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, D3DVECTOR &p)
+bool IntersectY(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, D3DVECTOR &p)
{
#if 0
D3DVECTOR d,e,i;
@@ -426,9 +426,9 @@ BOOL IntersectY(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, D3DVECTOR &p) e.x = p.x;
e.y = 1.0f;
e.z = p.z;
- if ( !Intersect(a,b,c,d,e,i) ) return FALSE;
+ if ( !Intersect(a,b,c,d,e,i) ) return false;
p.y = i.y;
- return TRUE;
+ return true;
#else
float d, d1, d2;
@@ -436,10 +436,10 @@ BOOL IntersectY(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, D3DVECTOR &p) d1 = (p.x-a.x)*(c.z-a.z) - (c.x-a.x)*(p.z-a.z);
d2 = (b.x-a.x)*(p.z-a.z) - (p.x-a.x)*(b.z-a.z);
- if ( d == 0.0f ) return FALSE;
+ if ( d == 0.0f ) return false;
p.y = a.y + d1/d*(b.y-a.y) + d2/d*(c.y-a.y);
- return TRUE;
+ return true;
#endif
}
@@ -685,7 +685,7 @@ void SmoothObject(D3DVERTEX2* pVertices, int nb) for ( i=0 ; i<nb ; i++ )
{
- bDone[i] = TRUE;
+ bDone[i] = true;
rank = 0;
index[rank++] = i;
@@ -696,7 +696,7 @@ void SmoothObject(D3DVERTEX2* pVertices, int nb) pVertices[j].y == pVertices[i].y &&
pVertices[j].z == pVertices[i].z )
{
- bDone[j] = TRUE;
+ bDone[j] = true;
index[rank++] = j;
if ( rank >= 100 ) break;
}
@@ -729,20 +729,20 @@ void SmoothObject(D3DVERTEX2* pVertices, int nb) // Calculates the parameters a and b of the segment passing
// through the points p1 and p2, knowing that:
// f(x) = ax+b
-// Returns FALSE if the line is vertical.
+// Returns false if the line is vertical.
-BOOL LineFunction(FPOINT p1, FPOINT p2, float &a, float &b)
+bool LineFunction(FPOINT p1, FPOINT p2, float &a, float &b)
{
if ( D3DMath_IsZero(p1.x-p2.x) )
{
a = g_HUGE; // infinite slope!
b = p2.x;
- return FALSE;
+ return false;
}
a = (p2.y-p1.y)/(p2.x-p1.x);
b = p2.y - p2.x*a;
- return TRUE;
+ return true;
}
@@ -766,7 +766,7 @@ float DistancePlanPoint(const D3DVECTOR &a, const D3DVECTOR &b, // Check if two planes defined by 3 points are part of the same plan.
-BOOL IsSamePlane(D3DVECTOR *plan1, D3DVECTOR *plan2)
+bool IsSamePlane(D3DVECTOR *plan1, D3DVECTOR *plan2)
{
D3DVECTOR n1, n2;
float dist;
@@ -776,12 +776,12 @@ BOOL IsSamePlane(D3DVECTOR *plan1, D3DVECTOR *plan2) if ( Abs(n1.x-n2.x) > 0.1f ||
Abs(n1.y-n2.y) > 0.1f ||
- Abs(n1.z-n2.z) > 0.1f ) return FALSE;
+ Abs(n1.z-n2.z) > 0.1f ) return false;
dist = DistancePlanPoint(plan1[0], plan1[1], plan1[2], plan2[0]);
- if ( dist > 0.1f ) return FALSE;
+ if ( dist > 0.1f ) return false;
- return TRUE;
+ return true;
}
diff --git a/src/math/old/math3d.h b/src/math/old/math3d.h index 5c10047..f08f9a6 100644 --- a/src/math/old/math3d.h +++ b/src/math/old/math3d.h @@ -30,7 +30,7 @@ -BOOL IsEqual(float a, float b);
+bool IsEqual(float a, float b);
float Min(float a, float b);
float Min(float a, float b, float c);
@@ -51,7 +51,7 @@ void Swap(FPOINT &a, FPOINT &b); float Mod(float a, float m);
float NormAngle(float angle);
-BOOL TestAngle(float angle, float min, float max);
+bool TestAngle(float angle, float min, float max);
float Direction(float a, float g);
FPOINT RotatePoint(FPOINT center, float angle, FPOINT p);
@@ -61,9 +61,9 @@ float RotateAngle(float x, float y); float RotateAngle(FPOINT center, FPOINT p1, FPOINT p2);
float MidPoint(FPOINT a, FPOINT b, float px);
D3DVECTOR SegmentDist(const D3DVECTOR &p1, const D3DVECTOR &p2, float dist);
-BOOL IsInsideTriangle(FPOINT a, FPOINT b, FPOINT c, FPOINT p);
-BOOL Intersect(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, D3DVECTOR d, D3DVECTOR e, D3DVECTOR &i);
-BOOL IntersectY(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, D3DVECTOR &p);
+bool IsInsideTriangle(FPOINT a, FPOINT b, FPOINT c, FPOINT p);
+bool Intersect(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, D3DVECTOR d, D3DVECTOR e, D3DVECTOR &i);
+bool IntersectY(D3DVECTOR a, D3DVECTOR b, D3DVECTOR c, D3DVECTOR &p);
void RotatePoint(float cx, float cy, float angle, float &px, float &py);
void RotatePoint(D3DVECTOR center, float angleH, float angleV, D3DVECTOR &p);
void RotatePoint2(D3DVECTOR center, float angleH, float angleV, D3DVECTOR &p);
@@ -82,9 +82,9 @@ D3DVECTOR Projection(const D3DVECTOR &a, const D3DVECTOR &b, const D3DVECTOR &p) void MappingObject( D3DVERTEX2* pVertices, int nb, float scale );
void SmoothObject( D3DVERTEX2* pVertices, int nb );
-BOOL LineFunction(FPOINT p1, FPOINT p2, float &a, float &b);
+bool LineFunction(FPOINT p1, FPOINT p2, float &a, float &b);
float DistancePlanPoint(const D3DVECTOR &a, const D3DVECTOR &b, const D3DVECTOR &c, const D3DVECTOR &p);
-BOOL IsSamePlane(D3DVECTOR *plan1, D3DVECTOR *plan2);
+bool IsSamePlane(D3DVECTOR *plan1, D3DVECTOR *plan2);
void MatRotateXZY(D3DMATRIX &mat, D3DVECTOR angle);
void MatRotateZXY(D3DMATRIX &mat, D3DVECTOR angle);
diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp index 0600d86..94a8afa 100644 --- a/src/object/auto/auto.cpp +++ b/src/object/auto/auto.cpp @@ -79,7 +79,7 @@ CAuto::CAuto(CInstanceManager* iMan, CObject* object) m_type = m_object->RetType();
m_time = 0.0f;
m_lastUpdateTime = 0.0f;
- m_bMotor = FALSE;
+ m_bMotor = false;
m_progressTime = 0.0f;
m_progressTotal = 1.0f;
@@ -96,7 +96,7 @@ CAuto::~CAuto() // Destroys the object.
-void CAuto::DeleteObject(BOOL bAll)
+void CAuto::DeleteObject(bool bAll)
{
}
@@ -105,7 +105,7 @@ void CAuto::DeleteObject(BOOL bAll) void CAuto::Init()
{
- m_bBusy = FALSE;
+ m_bBusy = false;
}
// Starts the object.
@@ -117,29 +117,29 @@ void CAuto::Start(int param) // Give a type.
-BOOL CAuto::SetType(ObjectType type)
+bool CAuto::SetType(ObjectType type)
{
- return FALSE;
+ return false;
}
// Gives a value.
-BOOL CAuto::SetValue(int rank, float value)
+bool CAuto::SetValue(int rank, float value)
{
- return FALSE;
+ return false;
}
// Gives the string.
-BOOL CAuto::SetString(char *string)
+bool CAuto::SetString(char *string)
{
- return FALSE;
+ return false;
}
// Management of an event.
-BOOL CAuto::EventProcess(const Event &event)
+bool CAuto::EventProcess(const Event &event)
{
if ( event.event == EVENT_FRAME &&
!m_engine->RetPause() )
@@ -150,10 +150,10 @@ BOOL CAuto::EventProcess(const Event &event) if ( !m_object->RetSelect() ) // robot not selected?
{
- return TRUE;
+ return true;
}
- return TRUE;
+ return true;
}
// Indicates whether the controller has finished its activity.
@@ -165,15 +165,15 @@ Error CAuto::IsEnded() // Stops the controller
-BOOL CAuto::Abort()
+bool CAuto::Abort()
{
- return FALSE;
+ return false;
}
// Creates all the interface when the object is selected.
-BOOL CAuto::CreateInterface(BOOL bSelect)
+bool CAuto::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, dim, ddim;
@@ -187,7 +187,7 @@ BOOL CAuto::CreateInterface(BOOL bSelect) m_interface->DeleteControl(EVENT_WINDOW0); // destroys the window
}
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pos.x = 0.0f;
pos.y = 0.0f;
@@ -196,7 +196,7 @@ BOOL CAuto::CreateInterface(BOOL bSelect) dim.y = 86.0f/480.0f;
m_interface->CreateWindows(pos, dim, 3, EVENT_WINDOW0);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
m_object->GetTooltipName(name);
pos.x = 0.0f;
@@ -282,12 +282,12 @@ BOOL CAuto::CreateInterface(BOOL bSelect) m_lastUpdateTime = 0.0f;
UpdateInterface(0.0f);
- return TRUE;
+ return true;
}
// Change the state of a button interface.
-void CAuto::CheckInterface(CWindow *pw, EventMsg event, BOOL bState)
+void CAuto::CheckInterface(CWindow *pw, EventMsg event, bool bState)
{
CControl* control;
@@ -299,7 +299,7 @@ void CAuto::CheckInterface(CWindow *pw, EventMsg event, BOOL bState) // Change the state of a button interface.
-void CAuto::EnableInterface(CWindow *pw, EventMsg event, BOOL bState)
+void CAuto::EnableInterface(CWindow *pw, EventMsg event, bool bState)
{
CControl* control;
@@ -311,7 +311,7 @@ void CAuto::EnableInterface(CWindow *pw, EventMsg event, BOOL bState) // Change the state of a button interface.
-void CAuto::VisibleInterface(CWindow *pw, EventMsg event, BOOL bState)
+void CAuto::VisibleInterface(CWindow *pw, EventMsg event, bool bState)
{
CControl* control;
@@ -323,7 +323,7 @@ void CAuto::VisibleInterface(CWindow *pw, EventMsg event, BOOL bState) // Change the state of a button interface.
-void CAuto::DeadInterface(CWindow *pw, EventMsg event, BOOL bState)
+void CAuto::DeadInterface(CWindow *pw, EventMsg event, bool bState)
{
CControl* control;
@@ -387,12 +387,12 @@ Error CAuto::RetError() // Management of the occupation.
-BOOL CAuto::RetBusy()
+bool CAuto::RetBusy()
{
return m_bBusy;
}
-void CAuto::SetBusy(BOOL bBusy)
+void CAuto::SetBusy(bool bBusy)
{
m_bBusy = bBusy;
}
@@ -411,12 +411,12 @@ void CAuto::EventProgress(float rTime) // Engine management.
-BOOL CAuto::RetMotor()
+bool CAuto::RetMotor()
{
return m_bMotor;
}
-void CAuto::SetMotor(BOOL bMotor)
+void CAuto::SetMotor(bool bMotor)
{
m_bMotor = bMotor;
}
@@ -424,7 +424,7 @@ void CAuto::SetMotor(BOOL bMotor) // Saves all parameters of the controller.
-BOOL CAuto::Write(char *line)
+bool CAuto::Write(char *line)
{
char name[100];
@@ -443,12 +443,12 @@ BOOL CAuto::Write(char *line) sprintf(name, " aProgressTotal=%.2f", m_progressTotal);
strcat(line, name);
- return FALSE;
+ return false;
}
// Return all settings to the controller.
-BOOL CAuto::Read(char *line)
+bool CAuto::Read(char *line)
{
m_type = (ObjectType)OpInt(line, "aType", OBJECT_NULL);
m_bBusy = OpInt(line, "aBusy", 0);
@@ -456,6 +456,6 @@ BOOL CAuto::Read(char *line) m_progressTime = OpFloat(line, "aProgressTime", 0.0f);
m_progressTotal = OpFloat(line, "aProgressTotal", 0.0f);
- return FALSE;
+ return false;
}
diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h index 96f0212..5a631ec 100644 --- a/src/object/auto/auto.h +++ b/src/object/auto/auto.h @@ -46,39 +46,39 @@ class CAuto {
public:
CAuto(CInstanceManager* iMan, CObject* object);
- ~CAuto();
+ virtual ~CAuto();
- virtual void DeleteObject(BOOL bAll=FALSE);
+ virtual void DeleteObject(bool bAll=false);
virtual void Init();
virtual void Start(int param);
- virtual BOOL EventProcess(const Event &event);
+ virtual bool EventProcess(const Event &event);
virtual Error IsEnded();
- virtual BOOL Abort();
+ virtual bool Abort();
- virtual BOOL SetType(ObjectType type);
- virtual BOOL SetValue(int rank, float value);
- virtual BOOL SetString(char *string);
+ virtual bool SetType(ObjectType type);
+ virtual bool SetValue(int rank, float value);
+ virtual bool SetString(char *string);
- virtual BOOL CreateInterface(BOOL bSelect);
+ virtual bool CreateInterface(bool bSelect);
virtual Error RetError();
- virtual BOOL RetBusy();
- virtual void SetBusy(BOOL bBuse);
+ virtual bool RetBusy();
+ virtual void SetBusy(bool bBuse);
virtual void InitProgressTotal(float total);
virtual void EventProgress(float rTime);
- virtual BOOL RetMotor();
- virtual void SetMotor(BOOL bMotor);
+ virtual bool RetMotor();
+ virtual void SetMotor(bool bMotor);
- virtual BOOL Write(char *line);
- virtual BOOL Read(char *line);
+ virtual bool Write(char *line);
+ virtual bool Read(char *line);
protected:
- void CheckInterface(CWindow *pw, EventMsg event, BOOL bState);
- void EnableInterface(CWindow *pw, EventMsg event, BOOL bState);
- void VisibleInterface(CWindow *pw, EventMsg event, BOOL bState);
- void DeadInterface(CWindow *pw, EventMsg event, BOOL bState);
+ void CheckInterface(CWindow *pw, EventMsg event, bool bState);
+ void EnableInterface(CWindow *pw, EventMsg event, bool bState);
+ void VisibleInterface(CWindow *pw, EventMsg event, bool bState);
+ void DeadInterface(CWindow *pw, EventMsg event, bool bState);
void UpdateInterface();
void UpdateInterface(float rTime);
@@ -101,8 +101,8 @@ protected: CSound* m_sound;
ObjectType m_type;
- BOOL m_bBusy;
- BOOL m_bMotor;
+ bool m_bBusy;
+ bool m_bMotor;
float m_time;
float m_lastUpdateTime;
float m_progressTime;
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index f7c3ca6..5c1bb2d 100644 --- a/src/object/auto/autobase.cpp +++ b/src/object/auto/autobase.cpp @@ -76,13 +76,12 @@ CAutoBase::CAutoBase(CInstanceManager* iMan, CObject* object) CAutoBase::~CAutoBase()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoBase::DeleteObject(BOOL bAll)
+void CAutoBase::DeleteObject(bool bAll)
{
if ( m_soundChannel != -1 )
{
@@ -99,7 +98,7 @@ void CAutoBase::DeleteObject(BOOL bAll) void CAutoBase::Init()
{
- m_bOpen = FALSE;
+ m_bOpen = false;
m_time = 0.0f;
m_lastParticule = 0.0f;
m_lastMotorParticule = 0.0f;
@@ -127,7 +126,7 @@ void CAutoBase::Start(int param) // Management of an event.
-BOOL CAutoBase::EventProcess(const Event &event)
+bool CAutoBase::EventProcess(const Event &event)
{
D3DMATRIX* mat;
Event newEvent;
@@ -140,7 +139,7 @@ BOOL CAutoBase::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
begin:
iPos = m_object->RetPosition(0);
@@ -150,7 +149,7 @@ begin: if ( m_param != PARAM_STOP && // not placed on the ground?
m_param != PARAM_FIXSCENE )
{
- FreezeCargo(TRUE); // freeze whole cargo
+ FreezeCargo(true); // freeze whole cargo
}
if ( m_param == PARAM_STOP ) // raises the ground?
@@ -206,8 +205,8 @@ begin: m_progress = 0.0f;
m_speed = 1.0f/BASE_LAND_TIME;
- m_main->SetMovieLock(TRUE); // blocks everything until the end of the landing
- m_bMotor = TRUE; // lights the jet engine
+ m_main->SetMovieLock(true); // blocks everything until the end of the landing
+ m_bMotor = true; // lights the jet engine
m_camera->SetType(CAMERA_SCRIPT);
@@ -229,7 +228,7 @@ begin: if ( m_soundChannel == -1 )
{
- m_soundChannel = m_sound->Play(SOUND_FLY, m_posSound, 0.3f, 2.0f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_FLY, m_posSound, 0.3f, 2.0f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.5f, BASE_LAND_TIME, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 2.0f, SOPER_STOP);
}
@@ -267,8 +266,8 @@ begin: m_finalPos = pos;
m_object->SetPosition(0, pos);
- m_main->SetMovieLock(TRUE); // blocks everything until the end of the landing
- m_bMotor = TRUE; // lights the jet engine
+ m_main->SetMovieLock(true); // blocks everything until the end of the landing
+ m_bMotor = true; // lights the jet engine
m_camera->SetType(CAMERA_SCRIPT);
pos.x += 1000.0f;
@@ -312,7 +311,7 @@ begin: if ( m_soundChannel == -1 )
{
- m_soundChannel = m_sound->Play(SOUND_FLY, m_posSound, 0.0f, 1.2f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_FLY, m_posSound, 0.0f, 1.2f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, BASE_TRANSIT_TIME*0.55f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 0.8f, BASE_TRANSIT_TIME*0.45f, SOPER_STOP);
}
@@ -321,7 +320,7 @@ begin: if ( event.event == EVENT_UPDINTERFACE )
{
- if ( m_object->RetSelect() ) CreateInterface(TRUE);
+ if ( m_object->RetSelect() ) CreateInterface(true);
}
if ( event.event == EVENT_OBJECT_BTAKEOFF )
@@ -330,18 +329,18 @@ begin: if ( err != ERR_OK )
{
m_displayText->DisplayError(err, m_object);
- return FALSE;
+ return false;
}
- err = m_main->CheckEndMission(FALSE);
+ err = m_main->CheckEndMission(false);
if ( err != ERR_OK )
{
m_displayText->DisplayError(err, m_object);
- return FALSE;
+ return false;
}
- FreezeCargo(TRUE); // freeze whole cargo
- m_main->SetMovieLock(TRUE); // blocks everything until the end
+ FreezeCargo(true); // freeze whole cargo
+ m_main->SetMovieLock(true); // blocks everything until the end
m_main->DeselectAll();
m_event->MakeEvent(newEvent, EVENT_UPDINTERFACE);
@@ -362,18 +361,18 @@ begin: m_engine->SetFocus(1.0f);
- m_soundChannel = m_sound->Play(SOUND_MANIP, m_posSound, 0.3f, 1.5f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MANIP, m_posSound, 0.3f, 1.5f, true);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 1.5f, BASE_DOOR_TIME2, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 1.5f, 0.5f, SOPER_STOP);
m_phase = ABP_CLOSE2;
m_progress = 0.0f;
m_speed = 1.0f/BASE_DOOR_TIME2;
- return TRUE;
+ return true;
}
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_phase == ABP_WAIT ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_phase == ABP_WAIT ) return true;
m_progress += event.rTime*m_speed;
@@ -458,7 +457,7 @@ begin: }
else
{
- m_bMotor = FALSE; // put out the reactor
+ m_bMotor = false; // put out the reactor
m_object->SetPosition(0, m_pos); // setting down
m_object->SetCirVibration(D3DVECTOR(0.0f, 0.0f, 0.0f));
@@ -514,7 +513,7 @@ begin: }
else
{
- m_soundChannel = m_sound->Play(SOUND_MANIP, m_posSound, 0.0f, 0.3f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MANIP, m_posSound, 0.0f, 0.3f, true);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 0.3f, 1.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 1.0f, BASE_DOOR_TIME-1.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.3f, 1.0f, SOPER_STOP);
@@ -574,7 +573,7 @@ begin: m_particule->CreateParticule(pos, speed, dim, PARTICRASH, time, 0.0f, 2.0f);
}
- m_soundChannel = m_sound->Play(SOUND_MANIP, m_posSound, 0.3f, 1.5f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MANIP, m_posSound, 0.3f, 1.5f, true);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 1.5f, BASE_DOOR_TIME2, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 1.5f, 0.5f, SOPER_STOP);
@@ -632,11 +631,11 @@ begin: {
if ( m_progress >= 1.0f )
{
- FreezeCargo(FALSE); // frees all cargo
+ FreezeCargo(false); // frees all cargo
if ( m_param != PARAM_PORTICO )
{
- m_main->SetMovieLock(FALSE); // you can play!
+ m_main->SetMovieLock(false); // you can play!
pObj = m_main->RetSelectObject();
m_main->SelectObject(pObj);
@@ -656,7 +655,7 @@ begin: m_engine->SetFogStart(m_fogStart);
}
- m_bOpen = TRUE;
+ m_bOpen = true;
m_phase = ABP_WAIT;
m_progress = 0.0f;
m_speed = 1.0f/1.0f;
@@ -686,7 +685,7 @@ begin: m_object->SetAngleX(18+i, 0.0f);
}
- m_soundChannel = m_sound->Play(SOUND_MANIP, m_posSound, 0.0f, 0.3f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MANIP, m_posSound, 0.0f, 0.3f, true);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 0.3f, 1.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 1.0f, BASE_DOOR_TIME-1.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.3f, 1.0f, SOPER_STOP);
@@ -713,7 +712,7 @@ begin: {
m_object->SetAngleZ(1+i, PI/2.0f);
}
- m_bMotor = TRUE; // lights the jet engine
+ m_bMotor = true; // lights the jet engine
// Shock of the closing doors.
max = (int)(20.0f*m_engine->RetParticuleDensity());
@@ -734,7 +733,7 @@ begin: m_sound->Play(SOUND_BOUM, m_object->RetPosition(0));
m_soundChannel = -1;
- m_bOpen = FALSE;
+ m_bOpen = false;
m_phase = ABP_TOWAIT;
m_progress = 0.0f;
m_speed = 1.0f/2.0f;
@@ -747,7 +746,7 @@ begin: {
if ( m_soundChannel == -1 )
{
- m_soundChannel = m_sound->Play(SOUND_FLY, m_posSound, 0.0f, 0.5f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_FLY, m_posSound, 0.0f, 0.5f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.5f, 2.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 2.0f, BASE_TAKO_TIME, SOPER_STOP);
}
@@ -1101,12 +1100,12 @@ begin: m_sound->Position(m_soundChannel, pos);
}
- return TRUE;
+ return true;
}
// Stops the controller.
-BOOL CAutoBase::Abort()
+bool CAutoBase::Abort()
{
Event newEvent;
CObject* pObj;
@@ -1129,7 +1128,7 @@ BOOL CAutoBase::Abort() m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.8f, 0.01f, SOPER_STOP);
m_soundChannel = -1;
}
- return TRUE;
+ return true;
}
if ( m_param == PARAM_PORTICO ) // gate on the porch?
@@ -1153,8 +1152,8 @@ BOOL CAutoBase::Abort() m_phase == ABP_OPEN ||
m_phase == ABP_OPEN2 ) // Landing?
{
- m_bMotor = FALSE; // put out the jet engine
- m_bOpen = TRUE;
+ m_bMotor = false; // put out the jet engine
+ m_bOpen = true;
m_object->SetPosition(0, m_pos); // setting down
m_object->SetCirVibration(D3DVECTOR(0.0f, 0.0f, 0.0f));
@@ -1168,7 +1167,7 @@ BOOL CAutoBase::Abort() m_object->SetPosition(18+i, D3DVECTOR(23.5f, 0.0f, 11.5f));
}
- m_main->SetMovieLock(FALSE); // you can play!
+ m_main->SetMovieLock(false); // you can play!
pObj = m_main->RetSelectObject();
m_main->SelectObject(pObj);
@@ -1197,7 +1196,7 @@ BOOL CAutoBase::Abort() }
m_object->SetAngleZ(0, 0.0f);
- FreezeCargo(FALSE); // frees all cargo
+ FreezeCargo(false); // frees all cargo
if ( m_soundChannel != -1 )
{
@@ -1210,7 +1209,7 @@ BOOL CAutoBase::Abort() m_progress = 0.0f;
m_speed = 1.0f/2.0f;
- return TRUE;
+ return true;
}
@@ -1224,7 +1223,7 @@ Error CAutoBase::RetError() // Creates all the interface when the object is selected.
-BOOL CAutoBase::CreateInterface(BOOL bSelect)
+bool CAutoBase::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, dim, ddim;
@@ -1233,10 +1232,10 @@ BOOL CAutoBase::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
dim.x = 33.0f/640.0f;
dim.y = 33.0f/480.0f;
@@ -1273,7 +1272,7 @@ BOOL CAutoBase::CreateInterface(BOOL bSelect) UpdateInterface();
- return TRUE;
+ return true;
}
// Updates the status of all interface buttons.
@@ -1292,7 +1291,7 @@ void CAutoBase::UpdateInterface() // Freeze or frees all cargo.
-void CAutoBase::FreezeCargo(BOOL bFreeze)
+void CAutoBase::FreezeCargo(bool bFreeze)
{
CObject* pObj;
CPhysics* physics;
@@ -1305,7 +1304,7 @@ void CAutoBase::FreezeCargo(BOOL bFreeze) pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i);
if ( pObj == 0 ) break;
- pObj->SetCargo(FALSE);
+ pObj->SetCargo(false);
if ( pObj == m_object ) continue; // yourself?
if ( pObj->RetTruck() != 0 ) continue; // transport object?
@@ -1316,7 +1315,7 @@ void CAutoBase::FreezeCargo(BOOL bFreeze) {
if ( bFreeze )
{
- pObj->SetCargo(TRUE);
+ pObj->SetCargo(true);
}
physics = pObj->RetPhysics();
@@ -1403,7 +1402,7 @@ Error CAutoBase::CheckCloseDoor() void CAutoBase::BeginTransit()
{
- BOOL bFull, bQuarter;
+ bool bFull, bQuarter;
if ( m_param == PARAM_TRANSIT2 )
{
@@ -1432,7 +1431,7 @@ void CAutoBase::BeginTransit() m_engine->SetBackground(m_bgBack, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
m_engine->LoadTexture(m_bgBack);
- m_cloud->SetEnable(FALSE); // cache clouds
+ m_cloud->SetEnable(false); // cache clouds
m_planet->SetMode(1);
}
@@ -1449,7 +1448,7 @@ void CAutoBase::EndTransit() m_engine->SetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown);
m_engine->LoadTexture(m_bgName);
- m_cloud->SetEnable(TRUE); // gives the clouds
+ m_cloud->SetEnable(true); // gives the clouds
m_planet->SetMode(0);
m_main->StartMusic();
diff --git a/src/object/auto/autobase.h b/src/object/auto/autobase.h index 5610d6e..1a3623d 100644 --- a/src/object/auto/autobase.h +++ b/src/object/auto/autobase.h @@ -74,19 +74,19 @@ public: CAutoBase(CInstanceManager* iMan, CObject* object);
~CAutoBase();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
void Start(int param);
- BOOL EventProcess(const Event &event);
- BOOL Abort();
+ bool EventProcess(const Event &event);
+ bool Abort();
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
protected:
void UpdateInterface();
- void FreezeCargo(BOOL bFreeze);
+ void FreezeCargo(bool bFreeze);
void MoveCargo();
Error CheckCloseDoor();
void BeginTransit();
@@ -94,7 +94,7 @@ protected: protected:
AutoBasePhase m_phase;
- BOOL m_bOpen;
+ bool m_bOpen;
float m_progress;
float m_speed;
float m_lastParticule;
diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index 54d495a..6cc94e5 100644 --- a/src/object/auto/autoconvert.cpp +++ b/src/object/auto/autoconvert.cpp @@ -52,7 +52,7 @@ CAutoConvert::CAutoConvert(CInstanceManager* iMan, CObject* object) {
Init();
m_phase = ACP_STOP;
- m_bResetDelete = FALSE;
+ m_bResetDelete = false;
m_soundChannel = -1;
}
@@ -60,13 +60,12 @@ CAutoConvert::CAutoConvert(CInstanceManager* iMan, CObject* object) CAutoConvert::~CAutoConvert()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoConvert::DeleteObject(BOOL bAll)
+void CAutoConvert::DeleteObject(bool bAll)
{
CObject* fret;
@@ -108,7 +107,7 @@ void CAutoConvert::Init() // Management of an event.
-BOOL CAutoConvert::EventProcess(const Event &event)
+bool CAutoConvert::EventProcess(const Event &event)
{
CObject* fret;
D3DVECTOR pos, speed;
@@ -117,8 +116,8 @@ BOOL CAutoConvert::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -137,12 +136,12 @@ BOOL CAutoConvert::EventProcess(const Event &event) m_object->SetAngleX(2, -PI*0.35f*(0.8f+Rand()*0.2f));
m_object->SetAngleX(3, -PI*0.35f*(0.8f+Rand()*0.2f));
}
- return TRUE;
+ return true;
}
EventProgress(event.rTime);
- if ( m_phase == ACP_STOP ) return TRUE;
+ if ( m_phase == ACP_STOP ) return true;
if ( m_phase == ACP_WAIT )
{
@@ -157,14 +156,14 @@ BOOL CAutoConvert::EventProcess(const Event &event) }
else
{
- fret->SetLock(TRUE); // stone usable
+ fret->SetLock(true); // stone usable
- SetBusy(TRUE);
+ SetBusy(true);
InitProgressTotal(3.0f+10.0f+1.5f);
UpdateInterface();
m_sound->Play(SOUND_OPEN, m_object->RetPosition(0), 1.0f, 1.0f);
- m_bSoundClose = FALSE;
+ m_bSoundClose = false;
m_phase = ACP_CLOSE;
m_progress = 0.0f;
@@ -179,7 +178,7 @@ BOOL CAutoConvert::EventProcess(const Event &event) {
if ( m_progress >= 0.8f && !m_bSoundClose )
{
- m_bSoundClose = TRUE;
+ m_bSoundClose = true;
m_sound->Play(SOUND_CLOSE, m_object->RetPosition(0), 1.0f, 0.8f);
}
angle = -PI*0.35f*(1.0f-Bounce(m_progress, 0.85f, 0.05f));
@@ -191,7 +190,7 @@ BOOL CAutoConvert::EventProcess(const Event &event) m_object->SetAngleX(2, 0.0f);
m_object->SetAngleX(3, 0.0f);
- m_soundChannel = m_sound->Play(SOUND_CONVERT, m_object->RetPosition(0), 0.0f, 0.25f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_CONVERT, m_object->RetPosition(0), 0.0f, 0.25f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.25f, 0.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.00f, 4.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.25f, 4.5f, SOPER_CONTINUE);
@@ -290,7 +289,7 @@ BOOL CAutoConvert::EventProcess(const Event &event) m_object->SetAngleX(2, -PI*0.35f);
m_object->SetAngleX(3, -PI*0.35f);
- SetBusy(FALSE);
+ SetBusy(false);
UpdateInterface();
m_phase = ACP_WAIT;
@@ -299,7 +298,7 @@ BOOL CAutoConvert::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Returns an error due the state of the automation.
@@ -317,7 +316,7 @@ Error CAutoConvert::RetError() // Cancels the current transformation.
-BOOL CAutoConvert::Abort()
+bool CAutoConvert::Abort()
{
if ( m_soundChannel != -1 )
{
@@ -336,16 +335,16 @@ BOOL CAutoConvert::Abort() m_progress = 0.0f;
m_speed = 1.0f/2.0f;
- SetBusy(FALSE);
+ SetBusy(false);
UpdateInterface();
- return TRUE;
+ return true;
}
// Creates all the interface when the object is selected.
-BOOL CAutoConvert::CreateInterface(BOOL bSelect)
+bool CAutoConvert::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -353,10 +352,10 @@ BOOL CAutoConvert::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -369,18 +368,18 @@ BOOL CAutoConvert::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 103, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
// Saves all parameters of the controller.
-BOOL CAutoConvert::Write(char *line)
+bool CAutoConvert::Write(char *line)
{
char name[100];
if ( m_phase == ACP_STOP ||
- m_phase == ACP_WAIT ) return FALSE;
+ m_phase == ACP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -396,14 +395,14 @@ BOOL CAutoConvert::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoConvert::Read(char *line)
+bool CAutoConvert::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -413,7 +412,7 @@ BOOL CAutoConvert::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
@@ -449,7 +448,7 @@ CObject* CAutoConvert::SearchStone(ObjectType type) // Search if a vehicle is too close.
-BOOL CAutoConvert::SearchVehicle()
+bool CAutoConvert::SearchVehicle()
{
CObject* pObj;
D3DVECTOR cPos, oPos;
@@ -509,10 +508,10 @@ BOOL CAutoConvert::SearchVehicle() if ( !pObj->GetCrashSphere(0, oPos, oRadius) ) continue;
dist = Length(oPos, cPos)-oRadius;
- if ( dist < 8.0f ) return TRUE;
+ if ( dist < 8.0f ) return true;
}
- return FALSE;
+ return false;
}
// Creates an object metal.
diff --git a/src/object/auto/autoconvert.h b/src/object/auto/autoconvert.h index dbe7b26..5d610eb 100644 --- a/src/object/auto/autoconvert.h +++ b/src/object/auto/autoconvert.h @@ -49,21 +49,21 @@ public: CAutoConvert(CInstanceManager* iMan, CObject* object);
~CAutoConvert();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL Abort();
+ bool Abort();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
CObject* SearchStone(ObjectType type);
- BOOL SearchVehicle();
+ bool SearchVehicle();
void CreateMetal();
protected:
@@ -72,8 +72,8 @@ protected: float m_speed;
float m_timeVirus;
float m_lastParticule;
- BOOL m_bResetDelete;
- BOOL m_bSoundClose;
+ bool m_bResetDelete;
+ bool m_bSoundClose;
int m_soundChannel;
};
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index b28652f..8350da8 100644 --- a/src/object/auto/autoderrick.cpp +++ b/src/object/auto/autoderrick.cpp @@ -63,13 +63,12 @@ CAutoDerrick::CAutoDerrick(CInstanceManager* iMan, CObject* object) CAutoDerrick::~CAutoDerrick()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoDerrick::DeleteObject(BOOL bAll)
+void CAutoDerrick::DeleteObject(bool bAll)
{
CObject* fret;
@@ -146,7 +145,7 @@ void CAutoDerrick::Init() // Management of an event.
-BOOL CAutoDerrick::EventProcess(const Event &event)
+bool CAutoDerrick::EventProcess(const Event &event)
{
CObject* fret;
D3DVECTOR pos, speed;
@@ -155,9 +154,9 @@ BOOL CAutoDerrick::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_phase == ADP_WAIT ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_phase == ADP_WAIT ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -175,7 +174,7 @@ BOOL CAutoDerrick::EventProcess(const Event &event) m_object->SetAngleY(1, Rand()*0.5f); // rotates the drill
}
- return TRUE;
+ return true;
}
if ( m_phase == ADP_EXCAVATE )
@@ -190,7 +189,7 @@ BOOL CAutoDerrick::EventProcess(const Event &event) {
factor = 1.0f;
}
- m_soundChannel = m_sound->Play(SOUND_DERRICK, m_object->RetPosition(0), 1.0f, 0.5f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_DERRICK, m_object->RetPosition(0), 1.0f, 0.5f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.5f, 4.0f*factor, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.3f, 6.0f*factor, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.5f, 1.0f, SOPER_CONTINUE);
@@ -296,7 +295,7 @@ BOOL CAutoDerrick::EventProcess(const Event &event) else
{
m_soundChannel = -1;
- m_bSoundFall = FALSE;
+ m_bSoundFall = false;
m_phase = ADP_EXPORT;
m_progress = 0.0f;
@@ -308,7 +307,7 @@ BOOL CAutoDerrick::EventProcess(const Event &event) {
if ( m_progress >= 1.0f )
{
- m_bSoundFall = FALSE;
+ m_bSoundFall = false;
m_phase = ADP_EXPORT;
m_progress = 0.0f;
@@ -330,7 +329,7 @@ BOOL CAutoDerrick::EventProcess(const Event &event) m_phase = ADP_ISFREE;
m_progress = 0.0f;
m_speed = 1.0f/2.0f;
- return TRUE;
+ return true;
}
}
@@ -375,12 +374,12 @@ BOOL CAutoDerrick::EventProcess(const Event &event) if ( !m_bSoundFall && pos.y < m_fretPos.y )
{
m_sound->Play(SOUND_BOUM, m_fretPos);
- m_bSoundFall = TRUE;
+ m_bSoundFall = true;
}
if ( pos.y < m_fretPos.y )
{
pos.y = m_fretPos.y;
- fret->SetLock(FALSE); // object usable
+ fret->SetLock(false); // object usable
}
fret->SetPosition(0, pos);
}
@@ -402,13 +401,13 @@ BOOL CAutoDerrick::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Creates all the interface when the object is selected.
-BOOL CAutoDerrick::CreateInterface(BOOL bSelect)
+bool CAutoDerrick::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -416,10 +415,10 @@ BOOL CAutoDerrick::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -432,17 +431,17 @@ BOOL CAutoDerrick::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 109, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
// Saves all parameters of the controller.
-BOOL CAutoDerrick::Write(char *line)
+bool CAutoDerrick::Write(char *line)
{
char name[100];
- if ( m_phase == ADP_WAIT ) return FALSE;
+ if ( m_phase == ADP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -458,14 +457,14 @@ BOOL CAutoDerrick::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoDerrick::Read(char *line)
+bool CAutoDerrick::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -475,7 +474,7 @@ BOOL CAutoDerrick::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
@@ -507,7 +506,7 @@ CObject* CAutoDerrick::SearchFret() // Seeks if a site is free.
-BOOL CAutoDerrick::SearchFree(D3DVECTOR pos)
+bool CAutoDerrick::SearchFree(D3DVECTOR pos)
{
CObject* pObj;
D3DVECTOR sPos;
@@ -528,11 +527,11 @@ BOOL CAutoDerrick::SearchFree(D3DVECTOR pos) {
distance = Length(sPos, pos);
distance -= sRadius;
- if ( distance < 2.0f ) return FALSE; // location occupied
+ if ( distance < 2.0f ) return false; // location occupied
}
}
- return TRUE; // location free
+ return true; // location free
}
// Create a transportable object.
@@ -549,7 +548,7 @@ void CAutoDerrick::CreateFret(D3DVECTOR pos, float angle, ObjectType type, m_displayText->DisplayError(ERR_TOOMANY, m_object);
return;
}
- fret->SetLock(TRUE); // object not yet usable
+ fret->SetLock(true); // object not yet usable
if ( m_object->RetResetCap() == RESET_MOVE )
{
@@ -563,7 +562,7 @@ void CAutoDerrick::CreateFret(D3DVECTOR pos, float angle, ObjectType type, // Look if there is already a key.
-BOOL CAutoDerrick::ExistKey()
+bool CAutoDerrick::ExistKey()
{
CObject* pObj;
ObjectType type;
@@ -572,7 +571,7 @@ BOOL CAutoDerrick::ExistKey() if ( m_type != OBJECT_KEYa &&
m_type != OBJECT_KEYb &&
m_type != OBJECT_KEYc &&
- m_type != OBJECT_KEYd ) return FALSE;
+ m_type != OBJECT_KEYd ) return false;
for ( i=0 ; i<1000000 ; i++ )
{
@@ -580,10 +579,10 @@ BOOL CAutoDerrick::ExistKey() if ( pObj == 0 ) break;
type = pObj->RetType();
- if ( type == m_type ) return TRUE;
+ if ( type == m_type ) return true;
}
- return FALSE;
+ return false;
}
diff --git a/src/object/auto/autoderrick.h b/src/object/auto/autoderrick.h index 841831d..9306a86 100644 --- a/src/object/auto/autoderrick.h +++ b/src/object/auto/autoderrick.h @@ -50,22 +50,22 @@ public: CAutoDerrick(CInstanceManager* iMan, CObject* object);
~CAutoDerrick();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
CObject* SearchFret();
- BOOL SearchFree(D3DVECTOR pos);
+ bool SearchFree(D3DVECTOR pos);
void CreateFret(D3DVECTOR pos, float angle, ObjectType type, float height);
- BOOL ExistKey();
+ bool ExistKey();
protected:
AutoDerrickPhase m_phase;
@@ -76,6 +76,6 @@ protected: float m_lastTrack;
D3DVECTOR m_fretPos;
int m_soundChannel;
- BOOL m_bSoundFall;
+ bool m_bSoundFall;
};
diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index 47b18cf..2f999fc 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/src/object/auto/autodestroyer.cpp @@ -60,13 +60,12 @@ CAutoDestroyer::CAutoDestroyer(CInstanceManager* iMan, CObject* object) CAutoDestroyer::~CAutoDestroyer()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoDestroyer::DeleteObject(BOOL bAll)
+void CAutoDestroyer::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -90,7 +89,7 @@ void CAutoDestroyer::Init() // Management of an event.
-BOOL CAutoDestroyer::EventProcess(const Event &event)
+bool CAutoDestroyer::EventProcess(const Event &event)
{
CObject* scrap;
CPyro* pyro;
@@ -99,8 +98,8 @@ BOOL CAutoDestroyer::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -111,7 +110,7 @@ BOOL CAutoDestroyer::EventProcess(const Event &event) {
m_timeVirus = 0.1f+Rand()*0.3f;
}
- return TRUE;
+ return true;
}
if ( m_phase == ADEP_WAIT )
@@ -127,7 +126,7 @@ BOOL CAutoDestroyer::EventProcess(const Event &event) }
else
{
- scrap->SetLock(TRUE); // usable waste
+ scrap->SetLock(true); // usable waste
//? scrap->SetTruck(m_object); // usable waste
if ( SearchVehicle() )
@@ -143,7 +142,7 @@ BOOL CAutoDestroyer::EventProcess(const Event &event) m_phase = ADEP_DOWN;
m_progress = 0.0f;
m_speed = 1.0f/1.0f;
- m_bExplo = FALSE;
+ m_bExplo = false;
}
}
}
@@ -159,7 +158,7 @@ BOOL CAutoDestroyer::EventProcess(const Event &event) pyro = new CPyro(m_iMan);
pyro->Create(PT_FRAGT, scrap);
}
- m_bExplo = TRUE;
+ m_bExplo = true;
}
if ( m_progress < 1.0f )
@@ -212,13 +211,13 @@ BOOL CAutoDestroyer::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Creates all the interface when the object is selected.
-BOOL CAutoDestroyer::CreateInterface(BOOL bSelect)
+bool CAutoDestroyer::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -226,10 +225,10 @@ BOOL CAutoDestroyer::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -242,7 +241,7 @@ BOOL CAutoDestroyer::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 106, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
@@ -277,7 +276,7 @@ CObject* CAutoDestroyer::SearchPlastic() // Seeks if one vehicle is too close.
-BOOL CAutoDestroyer::SearchVehicle()
+bool CAutoDestroyer::SearchVehicle()
{
CObject* pObj;
D3DVECTOR cPos, oPos;
@@ -330,10 +329,10 @@ BOOL CAutoDestroyer::SearchVehicle() if ( !pObj->GetCrashSphere(0, oPos, oRadius) ) continue;
dist = Length(oPos, cPos)-oRadius;
- if ( dist < 20.0f ) return TRUE;
+ if ( dist < 20.0f ) return true;
}
- return FALSE;
+ return false;
}
@@ -352,11 +351,11 @@ Error CAutoDestroyer::RetError() // Saves all parameters of the controller.
-BOOL CAutoDestroyer::Write(char *line)
+bool CAutoDestroyer::Write(char *line)
{
char name[100];
- if ( m_phase == ADEP_WAIT ) return FALSE;
+ if ( m_phase == ADEP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -372,14 +371,14 @@ BOOL CAutoDestroyer::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoDestroyer::Read(char *line)
+bool CAutoDestroyer::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -389,7 +388,7 @@ BOOL CAutoDestroyer::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autodestroyer.h b/src/object/auto/autodestroyer.h index 5fd0437..ececb32 100644 --- a/src/object/auto/autodestroyer.h +++ b/src/object/auto/autodestroyer.h @@ -47,20 +47,20 @@ public: CAutoDestroyer(CInstanceManager* iMan, CObject* object);
~CAutoDestroyer();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
CObject* SearchPlastic();
- BOOL SearchVehicle();
+ bool SearchVehicle();
protected:
AutoDestroyerPhase m_phase;
@@ -68,6 +68,6 @@ protected: float m_speed;
float m_timeVirus;
float m_lastParticule;
- BOOL m_bExplo;
+ bool m_bExplo;
};
diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 239e666..d8620ba 100644 --- a/src/object/auto/autoegg.cpp +++ b/src/object/auto/autoegg.cpp @@ -57,13 +57,12 @@ CAutoEgg::CAutoEgg(CInstanceManager* iMan, CObject* object) CAutoEgg::~CAutoEgg()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoEgg::DeleteObject(BOOL bAll)
+void CAutoEgg::DeleteObject(bool bAll)
{
CObject* alien;
@@ -78,8 +77,8 @@ void CAutoEgg::DeleteObject(BOOL bAll) // Original code: ( alien->RetZoom(0) == 1.0f )
if ( alien->RetZoomY(0) == 1.0f )
{
- alien->SetLock(FALSE);
- alien->SetActivity(TRUE); // the insect is active
+ alien->SetLock(false);
+ alien->SetActivity(true); // the insect is active
}
else
{
@@ -124,34 +123,34 @@ void CAutoEgg::Init() {
alien->SetZoom(0, 0.01f); // invisible !
}
- alien->SetLock(TRUE);
- alien->SetActivity(FALSE);
+ alien->SetLock(true);
+ alien->SetActivity(false);
}
// Gives a value.
-BOOL CAutoEgg::SetType(ObjectType type)
+bool CAutoEgg::SetType(ObjectType type)
{
m_type = type;
- return TRUE;
+ return true;
}
// Gives a value.
-BOOL CAutoEgg::SetValue(int rank, float value)
+bool CAutoEgg::SetValue(int rank, float value)
{
- if ( rank != 0 ) return FALSE;
+ if ( rank != 0 ) return false;
m_value = value;
- return TRUE;
+ return true;
}
// Gives the string.
-BOOL CAutoEgg::SetString(char *string)
+bool CAutoEgg::SetString(char *string)
{
strcpy(m_string, string);
- return TRUE;
+ return true;
}
@@ -172,21 +171,21 @@ void CAutoEgg::Start(int param) // Management of an event.
-BOOL CAutoEgg::EventProcess(const Event &event)
+bool CAutoEgg::EventProcess(const Event &event)
{
CObject* alien;
CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_phase == AEP_NULL ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_phase == AEP_NULL ) return true;
if ( m_phase == AEP_DELAY )
{
m_progress += event.rTime*m_speed;
- if ( m_progress < 1.0f ) return TRUE;
+ if ( m_progress < 1.0f ) return true;
alien = new CObject(m_iMan);
if ( !alien->CreateInsect(m_object->RetPosition(0), m_object->RetAngleY(0), m_type) )
@@ -195,17 +194,17 @@ BOOL CAutoEgg::EventProcess(const Event &event) m_phase = AEP_DELAY;
m_progress = 0.0f;
m_speed = 1.0f/2.0f;
- return TRUE;
+ return true;
}
- alien->SetActivity(FALSE);
+ alien->SetActivity(false);
alien->ReadProgram(0, m_string);
alien->RunProgram(0);
Init();
}
alien = SearchAlien();
- if ( alien == 0 ) return TRUE;
- alien->SetActivity(FALSE);
+ if ( alien == 0 ) return true;
+ alien->SetActivity(false);
m_progress += event.rTime*m_speed;
@@ -219,7 +218,7 @@ BOOL CAutoEgg::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Indicates whether the controller has completed its activity.
@@ -264,8 +263,8 @@ Error CAutoEgg::IsEnded() {
if ( m_progress < 1.0f ) return ERR_CONTINUE;
- alien->SetLock(FALSE);
- alien->SetActivity(TRUE); // the insect is active
+ alien->SetLock(false);
+ alien->SetActivity(true); // the insect is active
}
return ERR_STOP;
@@ -321,11 +320,11 @@ CObject* CAutoEgg::SearchAlien() // Saves all parameters of the controller.
-BOOL CAutoEgg::Write(char *line)
+bool CAutoEgg::Write(char *line)
{
char name[100];
- if ( m_phase == AEP_NULL ) return FALSE;
+ if ( m_phase == AEP_NULL ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -350,14 +349,14 @@ BOOL CAutoEgg::Write(char *line) sprintf(name, " aParamString=\"%s\"", m_string);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoEgg::Read(char *line)
+bool CAutoEgg::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -368,6 +367,6 @@ BOOL CAutoEgg::Read(char *line) m_value = OpFloat(line, "aParamValue1", 0.0f);
OpString(line, "aParamString", m_string);
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autoegg.h b/src/object/auto/autoegg.h index 6728f7d..d9a749f 100644 --- a/src/object/auto/autoegg.h +++ b/src/object/auto/autoegg.h @@ -50,20 +50,20 @@ public: CAutoEgg(CInstanceManager* iMan, CObject* object);
~CAutoEgg();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
void Start(int param);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error IsEnded();
Error RetError();
- BOOL SetType(ObjectType type);
- BOOL SetValue(int rank, float value);
- BOOL SetString(char *string);
+ bool SetType(ObjectType type);
+ bool SetValue(int rank, float value);
+ bool SetString(char *string);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
CObject* SearchAlien();
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp index 3f274bd..ba265e8 100644 --- a/src/object/auto/autoenergy.cpp +++ b/src/object/auto/autoenergy.cpp @@ -65,13 +65,12 @@ CAutoEnergy::CAutoEnergy(CInstanceManager* iMan, CObject* object) CAutoEnergy::~CAutoEnergy()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoEnergy::DeleteObject(BOOL bAll)
+void CAutoEnergy::DeleteObject(bool bAll)
{
CObject* fret;
@@ -121,19 +120,19 @@ void CAutoEnergy::Init() // Management of an event.
-BOOL CAutoEnergy::EventProcess(const Event &event)
+bool CAutoEnergy::EventProcess(const Event &event)
{
CObject* fret;
D3DVECTOR pos, ppos, speed;
FPOINT dim, c, p;
TerrainRes res;
float big;
- BOOL bGO;
+ bool bGO;
CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -157,7 +156,7 @@ BOOL CAutoEnergy::EventProcess(const Event &event) m_particule->CreateParticule(pos, speed, dim, PARTIFIREZ, 1.0f, 0.0f, 0.0f);
}
}
- return TRUE;
+ return true;
}
UpdateInterface(event.rTime);
@@ -175,17 +174,17 @@ BOOL CAutoEnergy::EventProcess(const Event &event) {
if ( m_progress >= 1.0f )
{
- bGO = FALSE;
+ bGO = false;
fret = SearchMetal(); // transform metal?
if ( fret != 0 )
{
if ( fret->RetType() == OBJECT_METAL )
{
- if ( big > ENERGY_POWER ) bGO = TRUE;
+ if ( big > ENERGY_POWER ) bGO = true;
}
else
{
- if ( !SearchVehicle() ) bGO = TRUE;
+ if ( !SearchVehicle() ) bGO = true;
}
}
@@ -193,11 +192,11 @@ BOOL CAutoEnergy::EventProcess(const Event &event) {
if ( fret->RetType() == OBJECT_METAL )
{
- fret->SetLock(TRUE); // usable metal
+ fret->SetLock(true); // usable metal
CreatePower(); // creates the battery
}
- SetBusy(TRUE);
+ SetBusy(true);
InitProgressTotal(ENERGY_DELAY);
CAuto::UpdateInterface();
@@ -333,7 +332,7 @@ BOOL CAutoEnergy::EventProcess(const Event &event) if ( fret != 0 )
{
fret->SetZoom(0, 1.0f);
- fret->SetLock(FALSE); // usable battery
+ fret->SetLock(false); // usable battery
fret->SetTruck(m_object);
fret->SetPosition(0, D3DVECTOR(0.0f, 3.0f, 0.0f));
m_object->SetPower(fret);
@@ -341,7 +340,7 @@ BOOL CAutoEnergy::EventProcess(const Event &event) m_displayText->DisplayError(INFO_ENERGY, m_object);
}
- SetBusy(FALSE);
+ SetBusy(false);
CAuto::UpdateInterface();
m_phase = AENP_SMOKE;
@@ -382,7 +381,7 @@ BOOL CAutoEnergy::EventProcess(const Event &event) if ( big > 1.0f ) big = 1.0f;
m_object->SetEnergy(big); // shift the big pile
- return TRUE;
+ return true;
}
@@ -407,7 +406,7 @@ CObject* CAutoEnergy::SearchMetal() // Search if a vehicle is too close.
-BOOL CAutoEnergy::SearchVehicle()
+bool CAutoEnergy::SearchVehicle()
{
CObject* pObj;
D3DVECTOR cPos, oPos;
@@ -460,10 +459,10 @@ BOOL CAutoEnergy::SearchVehicle() if ( !pObj->GetCrashSphere(0, oPos, oRadius) ) continue;
dist = Length(oPos, cPos)-oRadius;
- if ( dist < 10.0f ) return TRUE;
+ if ( dist < 10.0f ) return true;
}
- return FALSE;
+ return false;
}
// Create a cell.
@@ -484,7 +483,7 @@ void CAutoEnergy::CreatePower() m_displayText->DisplayError(ERR_TOOMANY, m_object);
return;
}
- power->SetLock(TRUE); // battery not yet usable
+ power->SetLock(true); // battery not yet usable
pos = power->RetPosition(0);
pos.y += 3.0f;
@@ -560,7 +559,7 @@ Error CAutoEnergy::RetError() // Creates all the interface when the object is selected.
-BOOL CAutoEnergy::CreateInterface(BOOL bSelect)
+bool CAutoEnergy::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -568,10 +567,10 @@ BOOL CAutoEnergy::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -590,7 +589,7 @@ BOOL CAutoEnergy::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 108, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
// Updates the state of all buttons on the interface,
@@ -621,12 +620,12 @@ void CAutoEnergy::UpdateInterface(float rTime) // Saves all parameters of the controller.
-BOOL CAutoEnergy::Write(char *line)
+bool CAutoEnergy::Write(char *line)
{
char name[100];
if ( m_phase == AENP_STOP ||
- m_phase == AENP_WAIT ) return FALSE;
+ m_phase == AENP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -642,14 +641,14 @@ BOOL CAutoEnergy::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoEnergy::Read(char *line)
+bool CAutoEnergy::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -660,5 +659,5 @@ BOOL CAutoEnergy::Read(char *line) m_lastUpdateTime = 0.0f;
m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autoenergy.h b/src/object/auto/autoenergy.h index 009bf85..f9f096e 100644 --- a/src/object/auto/autoenergy.h +++ b/src/object/auto/autoenergy.h @@ -49,22 +49,22 @@ public: CAutoEnergy(CInstanceManager* iMan, CObject* object);
~CAutoEnergy();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
void UpdateInterface(float rTime);
CObject* SearchMetal();
- BOOL SearchVehicle();
+ bool SearchVehicle();
void CreatePower();
CObject* SearchPower();
diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index e81f3e8..89bc399 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -66,13 +66,12 @@ CAutoFactory::CAutoFactory(CInstanceManager* iMan, CObject* object) CAutoFactory::~CAutoFactory()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoFactory::DeleteObject(BOOL bAll)
+void CAutoFactory::DeleteObject(bool bAll)
{
CObject* fret;
CObject* vehicle;
@@ -124,7 +123,7 @@ void CAutoFactory::Init() // Management of an event.
-BOOL CAutoFactory::EventProcess(const Event &event)
+bool CAutoFactory::EventProcess(const Event &event)
{
CObject* fret;
CObject* vehicle;
@@ -138,13 +137,13 @@ BOOL CAutoFactory::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
if ( m_object->RetSelect() ) // factory selected?
{
if ( event.event == EVENT_UPDINTERFACE )
{
- CreateInterface(TRUE);
+ CreateInterface(true);
}
type = OBJECT_NULL;
@@ -176,36 +175,36 @@ BOOL CAutoFactory::EventProcess(const Event &event) if ( m_phase != AFP_WAIT )
{
- return FALSE;
+ return false;
}
fret = SearchFret(); // transform metal?
if ( fret == 0 )
{
m_displayText->DisplayError(ERR_FACTORY_NULL, m_object);
- return FALSE;
+ return false;
}
if ( NearestVehicle() )
{
m_displayText->DisplayError(ERR_FACTORY_NEAR, m_object);
- return FALSE;
+ return false;
}
- SetBusy(TRUE);
+ SetBusy(true);
InitProgressTotal(3.0f+2.0f+15.0f+2.0f+3.0f);
UpdateInterface();
- fret->SetLock(TRUE); // usable metal
+ fret->SetLock(true); // usable metal
SoundManip(3.0f, 1.0f, 0.5f);
m_phase = AFP_CLOSE_S;
m_progress = 0.0f;
m_speed = 1.0f/3.0f;
- return TRUE;
+ return true;
}
}
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
EventProgress(event.rTime);
@@ -268,7 +267,7 @@ BOOL CAutoFactory::EventProcess(const Event &event) m_object->SetAngleZ(10+i, 0.0f);
}
- m_channelSound = m_sound->Play(SOUND_FACTORY, m_object->RetPosition(0), 0.0f, 1.0f, TRUE);
+ m_channelSound = m_sound->Play(SOUND_FACTORY, m_object->RetPosition(0), 0.0f, 1.0f, true);
m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f, 2.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f, 11.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_channelSound, 0.0f, 1.0f, 2.0f, SOPER_STOP);
@@ -288,7 +287,7 @@ BOOL CAutoFactory::EventProcess(const Event &event) fret = SearchFret(); // transform metal?
if ( fret != 0 )
{
- fret->SetLock(FALSE); // metal usable again
+ fret->SetLock(false); // metal usable again
}
if ( m_channelSound != -1 )
@@ -301,7 +300,7 @@ BOOL CAutoFactory::EventProcess(const Event &event) m_phase = AFP_OPEN_T;
m_progress = 0.0f;
m_speed = 1.0f/2.0f;
- return TRUE;
+ return true;
}
}
@@ -383,10 +382,10 @@ BOOL CAutoFactory::EventProcess(const Event &event) physics = vehicle->RetPhysics();
if ( physics != 0 )
{
- physics->SetFreeze(FALSE); // can move
+ physics->SetFreeze(false); // can move
}
- vehicle->SetLock(FALSE); // vehicle useable
+ vehicle->SetLock(false); // vehicle useable
//? vehicle->RetPhysics()->RetBrain()->StartTaskAdvance(16.0f);
vehicle->SetAngleY(0, m_object->RetAngleY(0)+PI);
vehicle->SetZoom(0, 1.0f);
@@ -476,7 +475,7 @@ BOOL CAutoFactory::EventProcess(const Event &event) m_object->SetZoomZ(10+i, 0.30f);
}
- SetBusy(FALSE);
+ SetBusy(false);
UpdateInterface();
m_phase = AFP_WAIT;
@@ -485,17 +484,17 @@ BOOL CAutoFactory::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Saves all parameters of the controller.
-BOOL CAutoFactory::Write(char *line)
+bool CAutoFactory::Write(char *line)
{
char name[100];
- if ( m_phase == AFP_WAIT ) return FALSE;
+ if ( m_phase == AFP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -511,14 +510,14 @@ BOOL CAutoFactory::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller
-BOOL CAutoFactory::Read(char *line)
+bool CAutoFactory::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -529,7 +528,7 @@ BOOL CAutoFactory::Read(char *line) m_lastParticule = 0.0f;
m_fretPos = m_object->RetPosition(0);
- return TRUE;
+ return true;
}
@@ -563,7 +562,7 @@ CObject* CAutoFactory::SearchFret() // Search if a vehicle is too close.
-BOOL CAutoFactory::NearestVehicle()
+bool CAutoFactory::NearestVehicle()
{
CObject* pObj;
D3DVECTOR cPos, oPos;
@@ -616,16 +615,16 @@ BOOL CAutoFactory::NearestVehicle() if ( !pObj->GetCrashSphere(0, oPos, oRadius) ) continue;
dist = Length(oPos, cPos)-oRadius;
- if ( dist < 10.0f ) return TRUE;
+ if ( dist < 10.0f ) return true;
}
- return FALSE;
+ return false;
}
// Creates a vehicle.
-BOOL CAutoFactory::CreateVehicle()
+bool CAutoFactory::CreateVehicle()
{
CObject* vehicle;
D3DMATRIX* mat;
@@ -652,20 +651,20 @@ BOOL CAutoFactory::CreateVehicle() pos = Transform(*mat, pos);
vehicle = new CObject(m_iMan);
- if ( !vehicle->CreateVehicle(pos, angle, m_type, -1.0f, FALSE, FALSE) )
+ if ( !vehicle->CreateVehicle(pos, angle, m_type, -1.0f, false, false) )
{
delete vehicle;
m_displayText->DisplayError(ERR_TOOMANY, m_object);
- return FALSE;
+ return false;
}
vehicle->UpdateMapping();
- vehicle->SetLock(TRUE); // not usable
+ vehicle->SetLock(true); // not usable
vehicle->SetRange(30.0f);
physics = vehicle->RetPhysics();
if ( physics != 0 )
{
- physics->SetFreeze(TRUE); // it doesn't move
+ physics->SetFreeze(true); // it doesn't move
}
for ( i=0 ; i<10 ; i++ )
@@ -675,7 +674,7 @@ BOOL CAutoFactory::CreateVehicle() vehicle->ReadProgram(i, name);
}
- return TRUE;
+ return true;
}
// Seeking the vehicle during manufacture.
@@ -711,7 +710,7 @@ CObject* CAutoFactory::SearchVehicle() // Creates all the interface when the object is selected.
-BOOL CAutoFactory::CreateInterface(BOOL bSelect)
+bool CAutoFactory::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, dim, ddim;
@@ -719,10 +718,10 @@ BOOL CAutoFactory::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
dim.x = 33.0f/640.0f;
dim.y = 33.0f/480.0f;
@@ -798,7 +797,7 @@ BOOL CAutoFactory::CreateInterface(BOOL bSelect) pw->CreateGroup(pos, ddim, 101, EVENT_OBJECT_TYPE);
UpdateInterface();
- return TRUE;
+ return true;
}
// Updates the status of all interface buttons.
@@ -838,9 +837,9 @@ void CAutoFactory::UpdateInterface() // Updates the status of one interface button.
-void CAutoFactory::UpdateButton(CWindow *pw, EventMsg event, BOOL bBusy)
+void CAutoFactory::UpdateButton(CWindow *pw, EventMsg event, bool bBusy)
{
- BOOL bEnable = TRUE;
+ bool bEnable = true;
EnableInterface(pw, event, !bBusy);
@@ -952,7 +951,7 @@ void CAutoFactory::SoundManip(float time, float amplitude, float frequency) {
int i;
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, true);
m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, 0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, time-0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.0f, 0.3f*frequency, 0.1f, SOPER_STOP);
diff --git a/src/object/auto/autofactory.h b/src/object/auto/autofactory.h index 00e1d6b..82e2a96 100644 --- a/src/object/auto/autofactory.h +++ b/src/object/auto/autofactory.h @@ -50,23 +50,23 @@ public: CAutoFactory(CInstanceManager* iMan, CObject* object);
~CAutoFactory();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
void UpdateInterface();
- void UpdateButton(CWindow *pw, EventMsg event, BOOL bBusy);
+ void UpdateButton(CWindow *pw, EventMsg event, bool bBusy);
CObject* SearchFret();
- BOOL NearestVehicle();
- BOOL CreateVehicle();
+ bool NearestVehicle();
+ bool CreateVehicle();
CObject* SearchVehicle();
void SoundManip(float time, float amplitude, float frequency);
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp index 4e29a96..53792cb 100644 --- a/src/object/auto/autoflag.cpp +++ b/src/object/auto/autoflag.cpp @@ -37,7 +37,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#if ADJUST_ANGLE
@@ -59,13 +59,12 @@ CAutoFlag::CAutoFlag(CInstanceManager* iMan, CObject* object) CAutoFlag::~CAutoFlag()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoFlag::DeleteObject(BOOL bAll)
+void CAutoFlag::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -104,7 +103,7 @@ void CAutoFlag::Start(int param) // Management of an event.
-BOOL CAutoFlag::EventProcess(const Event &event)
+bool CAutoFlag::EventProcess(const Event &event)
{
float angle;
int i;
@@ -123,8 +122,8 @@ BOOL CAutoFlag::EventProcess(const Event &event) }
#endif
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
if ( m_param == 1 ) // shakes?
{
@@ -145,7 +144,7 @@ BOOL CAutoFlag::EventProcess(const Event &event) }
}
- if ( m_strong == 0.0f ) return TRUE; // no wind?
+ if ( m_strong == 0.0f ) return true; // no wind?
for ( i=0 ; i<4 ; i++ )
{
@@ -162,7 +161,7 @@ BOOL CAutoFlag::EventProcess(const Event &event) sprintf(s, "a=%.2f b=%.2f c=%.2f", g_flag1, g_flag2, g_flag3);
m_engine->SetInfoText(4, s);
#endif
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autoflag.h b/src/object/auto/autoflag.h index 654f7a2..c52a25a 100644 --- a/src/object/auto/autoflag.h +++ b/src/object/auto/autoflag.h @@ -38,11 +38,11 @@ public: CAutoFlag(CInstanceManager* iMan, CObject* object);
~CAutoFlag();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
void Start(int param);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
protected:
diff --git a/src/object/auto/autohuston.cpp b/src/object/auto/autohuston.cpp index f3b7168..6a3202b 100644 --- a/src/object/auto/autohuston.cpp +++ b/src/object/auto/autohuston.cpp @@ -187,13 +187,12 @@ CAutoHuston::CAutoHuston(CInstanceManager* iMan, CObject* object) CAutoHuston::~CAutoHuston()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoHuston::DeleteObject(BOOL bAll)
+void CAutoHuston::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -219,7 +218,7 @@ void CAutoHuston::Start(int param) // Management of an event.
-BOOL CAutoHuston::EventProcess(const Event &event)
+bool CAutoHuston::EventProcess(const Event &event)
{
D3DVECTOR speed;
FPOINT dim;
@@ -228,14 +227,14 @@ BOOL CAutoHuston::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
angle = -m_time*1.0f;
m_object->SetAngleY(1, angle); // rotates the radar
angle = sinf(m_time*4.0f)*0.3f;
m_object->SetAngleX(2, angle);
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
@@ -263,20 +262,20 @@ BOOL CAutoHuston::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Stops the controller.
-BOOL CAutoHuston::Abort()
+bool CAutoHuston::Abort()
{
- return TRUE;
+ return true;
}
// Creates all the interface when the object is selected.
-BOOL CAutoHuston::CreateInterface(BOOL bSelect)
+bool CAutoHuston::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -284,10 +283,10 @@ BOOL CAutoHuston::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -300,7 +299,7 @@ BOOL CAutoHuston::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 115, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autohuston.h b/src/object/auto/autohuston.h index 8e26aa1..32954f7 100644 --- a/src/object/auto/autohuston.h +++ b/src/object/auto/autohuston.h @@ -53,15 +53,15 @@ public: CAutoHuston(CInstanceManager* iMan, CObject* object);
~CAutoHuston();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
void Start(int param);
- BOOL EventProcess(const Event &event);
- BOOL Abort();
+ bool EventProcess(const Event &event);
+ bool Abort();
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
protected:
diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp index 713b148..12dc2de 100644 --- a/src/object/auto/autoinfo.cpp +++ b/src/object/auto/autoinfo.cpp @@ -57,13 +57,12 @@ CAutoInfo::CAutoInfo(CInstanceManager* iMan, CObject* object) CAutoInfo::~CAutoInfo()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoInfo::DeleteObject(BOOL bAll)
+void CAutoInfo::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -76,7 +75,7 @@ void CAutoInfo::Init() m_phase = AIP_WAIT;
m_time = 0.0f;
m_timeVirus = 0.0f;
- m_bLastVirus = FALSE;
+ m_bLastVirus = false;
CAuto::Init();
}
@@ -142,7 +141,7 @@ void CAutoInfo::Start(int param) // Management of an event.
-BOOL CAutoInfo::EventProcess(const Event &event)
+bool CAutoInfo::EventProcess(const Event &event)
{
D3DVECTOR pos, speed;
FPOINT dim;
@@ -151,8 +150,8 @@ BOOL CAutoInfo::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_timeVirus -= event.rTime;
@@ -176,14 +175,14 @@ BOOL CAutoInfo::EventProcess(const Event &event) UpdateListVirus();
}
- m_bLastVirus = TRUE;
- return TRUE;
+ m_bLastVirus = true;
+ return true;
}
else
{
if ( m_bLastVirus )
{
- m_bLastVirus = FALSE;
+ m_bLastVirus = false;
UpdateList(); // normally returns the list
}
else
@@ -353,7 +352,7 @@ BOOL CAutoInfo::EventProcess(const Event &event) m_object->SetAngleX(5, sinf(m_time*6.0f+PI*2.0f/3.0f)*0.3f);
m_object->SetAngleX(7, sinf(m_time*6.0f+PI*4.0f/3.0f)*0.3f);
- return TRUE;
+ return true;
}
@@ -372,7 +371,7 @@ Error CAutoInfo::RetError() // Creates all the interface when the object is selected.
-BOOL CAutoInfo::CreateInterface(BOOL bSelect)
+bool CAutoInfo::CreateInterface(bool bSelect)
{
CWindow* pw;
CList* pl;
@@ -381,10 +380,10 @@ BOOL CAutoInfo::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -396,7 +395,7 @@ BOOL CAutoInfo::CreateInterface(BOOL bSelect) ddim.x = 160.0f/640.0f;
ddim.y = 66.0f/480.0f;
pl = pw->CreateList(pos, ddim, 1, EVENT_OBJECT_GINFO, 1.10f);
- pl->SetSelectCap(FALSE);
+ pl->SetSelectCap(false);
pos.x = ox+sx*0.0f;
pos.y = oy+sy*0;
@@ -405,7 +404,7 @@ BOOL CAutoInfo::CreateInterface(BOOL bSelect) pw->CreateGroup(pos, ddim, 112, EVENT_OBJECT_TYPE);
UpdateList();
- return TRUE;
+ return true;
}
// Updates the state of all buttons on the interface,
@@ -451,7 +450,7 @@ void CAutoInfo::UpdateList() }
}
- m_object->SetInfoUpdate(FALSE);
+ m_object->SetInfoUpdate(false);
}
// Updates the content of contaminating the list.
@@ -492,11 +491,11 @@ void CAutoInfo::UpdateListVirus() // Saves all parameters of the controller.
-BOOL CAutoInfo::Write(char *line)
+bool CAutoInfo::Write(char *line)
{
char name[100];
- if ( m_phase == AIP_WAIT ) return FALSE;
+ if ( m_phase == AIP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -512,14 +511,14 @@ BOOL CAutoInfo::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoInfo::Read(char *line)
+bool CAutoInfo::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -529,7 +528,7 @@ BOOL CAutoInfo::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autoinfo.h b/src/object/auto/autoinfo.h index 412a0af..7cd3002 100644 --- a/src/object/auto/autoinfo.h +++ b/src/object/auto/autoinfo.h @@ -48,17 +48,17 @@ public: CAutoInfo(CInstanceManager* iMan, CObject* object);
~CAutoInfo();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
void Start(int param);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
void UpdateInterface(float rTime);
@@ -72,6 +72,6 @@ protected: float m_timeVirus;
float m_lastParticule;
D3DVECTOR m_goal;
- BOOL m_bLastVirus;
+ bool m_bLastVirus;
};
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp index aec152e..93bdd6b 100644 --- a/src/object/auto/autojostle.cpp +++ b/src/object/auto/autojostle.cpp @@ -57,13 +57,12 @@ CAutoJostle::CAutoJostle(CInstanceManager* iMan, CObject* object) CAutoJostle::~CAutoJostle()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoJostle::DeleteObject(BOOL bAll)
+void CAutoJostle::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -106,15 +105,15 @@ void CAutoJostle::Start(int param, float force) // Management of an event.
-BOOL CAutoJostle::EventProcess(const Event &event)
+bool CAutoJostle::EventProcess(const Event &event)
{
D3DVECTOR dir;
float factor, angle, zoom;
CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
if ( m_progress < 1.0f )
{
@@ -152,7 +151,7 @@ BOOL CAutoJostle::EventProcess(const Event &event) m_error = ERR_STOP;
}
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autojostle.h b/src/object/auto/autojostle.h index d154ef1..c3a1bd8 100644 --- a/src/object/auto/autojostle.h +++ b/src/object/auto/autojostle.h @@ -38,11 +38,11 @@ public: CAutoJostle(CInstanceManager* iMan, CObject* object);
~CAutoJostle();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
void Start(int param, float force);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error IsEnded();
protected:
diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp index 79a9e2d..99d4c81 100644 --- a/src/object/auto/autokid.cpp +++ b/src/object/auto/autokid.cpp @@ -60,14 +60,12 @@ CAutoKid::~CAutoKid() m_sound->AddEnvelope(m_soundChannel, 0.0f, 1.0f, 1.0f, SOPER_STOP);
m_soundChannel = -1;
}
-
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoKid::DeleteObject(BOOL bAll)
+void CAutoKid::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -101,8 +99,8 @@ void CAutoKid::Init() {
if ( m_soundChannel == -1 )
{
-//? m_soundChannel = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 1.0f, 0.5f, TRUE);
- m_bSilent = FALSE;
+//? m_soundChannel = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 1.0f, 0.5f, true);
+ m_bSilent = false;
}
}
}
@@ -110,7 +108,7 @@ void CAutoKid::Init() // Management of an event.
-BOOL CAutoKid::EventProcess(const Event &event)
+bool CAutoKid::EventProcess(const Event &event)
{
D3DVECTOR vib, pos, speed;
FPOINT dim;
@@ -124,7 +122,7 @@ BOOL CAutoKid::EventProcess(const Event &event) if ( !m_bSilent )
{
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 0.1f, SOPER_CONTINUE);
- m_bSilent = TRUE;
+ m_bSilent = true;
}
}
else
@@ -132,13 +130,13 @@ BOOL CAutoKid::EventProcess(const Event &event) if ( m_bSilent )
{
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.5f, 0.1f, SOPER_CONTINUE);
- m_bSilent = FALSE;
+ m_bSilent = false;
}
}
}
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
@@ -206,7 +204,7 @@ BOOL CAutoKid::EventProcess(const Event &event) m_object->SetAngleX(2, m_progress*5.0f);
}
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autokid.h b/src/object/auto/autokid.h index 8e1c3af..677d1f0 100644 --- a/src/object/auto/autokid.h +++ b/src/object/auto/autokid.h @@ -38,10 +38,10 @@ public: CAutoKid(CInstanceManager* iMan, CObject* object);
~CAutoKid();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
protected:
@@ -51,6 +51,6 @@ protected: float m_progress;
float m_lastParticule;
int m_soundChannel;
- BOOL m_bSilent;
+ bool m_bSilent;
};
diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp index 06440a1..41b6299 100644 --- a/src/object/auto/autolabo.cpp +++ b/src/object/auto/autolabo.cpp @@ -73,13 +73,12 @@ CAutoLabo::CAutoLabo(CInstanceManager* iMan, CObject* object) CAutoLabo::~CAutoLabo()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoLabo::DeleteObject(BOOL bAll)
+void CAutoLabo::DeleteObject(bool bAll)
{
int i;
@@ -127,7 +126,7 @@ void CAutoLabo::Init() // Management of an event.
-BOOL CAutoLabo::EventProcess(const Event &event)
+bool CAutoLabo::EventProcess(const Event &event)
{
CObject* power;
D3DVECTOR pos, goal, speed;
@@ -137,11 +136,11 @@ BOOL CAutoLabo::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
if ( event.event == EVENT_UPDINTERFACE )
{
- if ( m_object->RetSelect() ) CreateInterface(TRUE);
+ if ( m_object->RetSelect() ) CreateInterface(true);
}
if ( m_object->RetSelect() && // center selected?
@@ -150,7 +149,7 @@ BOOL CAutoLabo::EventProcess(const Event &event) {
if ( m_phase != ALAP_WAIT )
{
- return FALSE;
+ return false;
}
m_research = event.event;
@@ -158,35 +157,35 @@ BOOL CAutoLabo::EventProcess(const Event &event) if ( TestResearch(m_research) )
{
m_displayText->DisplayError(ERR_LABO_ALREADY, m_object);
- return FALSE;
+ return false;
}
power = m_object->RetPower();
if ( power == 0 )
{
m_displayText->DisplayError(ERR_LABO_NULL, m_object);
- return FALSE;
+ return false;
}
if ( power->RetType() != OBJECT_BULLET )
{
m_displayText->DisplayError(ERR_LABO_BAD, m_object);
- return FALSE;
+ return false;
}
- SetBusy(TRUE);
+ SetBusy(true);
InitProgressTotal(1.0f+1.5f+1.5f+LABO_DELAY+1.5f+1.5f+1.0f);
UpdateInterface();
- power->SetLock(TRUE); // ball longer usable
+ power->SetLock(true); // ball longer usable
SoundManip(1.0f, 1.0f, 1.0f);
m_phase = ALAP_OPEN1;
m_progress = 0.0f;
m_speed = 1.0f/1.0f;
- return TRUE;
+ return true;
}
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -197,7 +196,7 @@ BOOL CAutoLabo::EventProcess(const Event &event) {
m_timeVirus = 0.1f+Rand()*0.3f;
}
- return TRUE;
+ return true;
}
EventProgress(event.rTime);
@@ -278,7 +277,7 @@ BOOL CAutoLabo::EventProcess(const Event &event) LABO_DELAY);
}
- m_soundChannel = m_sound->Play(SOUND_LABO, m_object->RetPosition(0), 0.0f, 0.25f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_LABO, m_object->RetPosition(0), 0.0f, 0.25f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.60f, 2.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 2.00f, 8.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 0.60f, 8.0f, SOPER_CONTINUE);
@@ -426,7 +425,7 @@ BOOL CAutoLabo::EventProcess(const Event &event) m_object->SetAngleZ(4, 80.0f*PI/180.0f);
m_object->SetAngleZ(5, 80.0f*PI/180.0f);
- SetBusy(FALSE);
+ SetBusy(false);
UpdateInterface();
m_phase = ALAP_WAIT;
@@ -435,7 +434,7 @@ BOOL CAutoLabo::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -462,7 +461,7 @@ Error CAutoLabo::RetError() // Creates all the interface when the object is selected.
-BOOL CAutoLabo::CreateInterface(BOOL bSelect)
+bool CAutoLabo::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, dim, ddim;
@@ -470,10 +469,10 @@ BOOL CAutoLabo::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
dim.x = 33.0f/640.0f;
dim.y = 33.0f/480.0f;
@@ -498,7 +497,7 @@ BOOL CAutoLabo::CreateInterface(BOOL bSelect) UpdateInterface();
- return TRUE;
+ return true;
}
// Updates the status of all interface buttons.
@@ -539,12 +538,12 @@ void CAutoLabo::OkayButton(CWindow *pw, EventMsg event) // Test whether a search has already been done.
-BOOL CAutoLabo::TestResearch(EventMsg event)
+bool CAutoLabo::TestResearch(EventMsg event)
{
if ( event == EVENT_OBJECT_RiPAW ) return (g_researchDone & RESEARCH_iPAW);
if ( event == EVENT_OBJECT_RiGUN ) return (g_researchDone & RESEARCH_iGUN);
- return FALSE;
+ return false;
}
// Indicates a search as made.
@@ -569,7 +568,7 @@ void CAutoLabo::SoundManip(float time, float amplitude, float frequency) {
int i;
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, true);
m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, 0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, time-0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.0f, 0.3f*frequency, 0.1f, SOPER_STOP);
@@ -578,12 +577,12 @@ void CAutoLabo::SoundManip(float time, float amplitude, float frequency) // Saves all parameters of the controller.
-BOOL CAutoLabo::Write(char *line)
+bool CAutoLabo::Write(char *line)
{
D3DVECTOR pos;
char name[100];
- if ( m_phase == ALAP_WAIT ) return FALSE;
+ if ( m_phase == ALAP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -602,16 +601,16 @@ BOOL CAutoLabo::Write(char *line) sprintf(name, " aResearch=%d", m_research);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoLabo::Read(char *line)
+bool CAutoLabo::Read(char *line)
{
D3DVECTOR pos;
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -622,7 +621,7 @@ BOOL CAutoLabo::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h index 0b1e91b..53faa0a 100644 --- a/src/object/auto/autolabo.h +++ b/src/object/auto/autolabo.h @@ -52,21 +52,21 @@ public: CAutoLabo(CInstanceManager* iMan, CObject* object);
~CAutoLabo();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
void UpdateInterface();
void OkayButton(CWindow *pw, EventMsg event);
- BOOL TestResearch(EventMsg event);
+ bool TestResearch(EventMsg event);
void SetResearch(EventMsg event);
void SoundManip(float time, float amplitude, float frequency);
diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp index 0a7ed4f..45aa019 100644 --- a/src/object/auto/automush.cpp +++ b/src/object/auto/automush.cpp @@ -53,13 +53,12 @@ CAutoMush::CAutoMush(CInstanceManager* iMan, CObject* object) CAutoMush::~CAutoMush()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoMush::DeleteObject(BOOL bAll)
+void CAutoMush::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -80,7 +79,7 @@ void CAutoMush::Init() // Management of an event.
-BOOL CAutoMush::EventProcess(const Event &event)
+bool CAutoMush::EventProcess(const Event &event)
{
D3DVECTOR pos, speed, dir;
FPOINT dim;
@@ -89,8 +88,8 @@ BOOL CAutoMush::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
@@ -229,13 +228,13 @@ BOOL CAutoMush::EventProcess(const Event &event) m_object->SetZoom(0, D3DVECTOR(1.0f, 1.0f, 1.0f));
}
- return TRUE;
+ return true;
}
// Seeking a nearby target.
-BOOL CAutoMush::SearchTarget()
+bool CAutoMush::SearchTarget()
{
CObject* pObj;
D3DVECTOR iPos, oPos;
@@ -298,10 +297,10 @@ BOOL CAutoMush::SearchTarget() oPos = pObj->RetPosition(0);
dist = Length(oPos, iPos);
- if ( dist < 50.0f ) return TRUE;
+ if ( dist < 50.0f ) return true;
}
- return FALSE;
+ return false;
}
@@ -315,12 +314,12 @@ Error CAutoMush::RetError() // Saves all parameters of the controller.
-BOOL CAutoMush::Write(char *line)
+bool CAutoMush::Write(char *line)
{
D3DVECTOR pos;
char name[100];
- if ( m_phase == AMP_WAIT ) return FALSE;
+ if ( m_phase == AMP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -336,16 +335,16 @@ BOOL CAutoMush::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoMush::Read(char *line)
+bool CAutoMush::Read(char *line)
{
D3DVECTOR pos;
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -355,7 +354,7 @@ BOOL CAutoMush::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/automush.h b/src/object/auto/automush.h index 5b5ea30..62bd322 100644 --- a/src/object/auto/automush.h +++ b/src/object/auto/automush.h @@ -49,17 +49,17 @@ public: CAutoMush(CInstanceManager* iMan, CObject* object);
~CAutoMush();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
- BOOL SearchTarget();
+ bool SearchTarget();
protected:
AutoMushPhase m_phase;
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 370dfe9..a9226ac 100644 --- a/src/object/auto/autonest.cpp +++ b/src/object/auto/autonest.cpp @@ -51,13 +51,12 @@ CAutoNest::CAutoNest(CInstanceManager* iMan, CObject* object) CAutoNest::~CAutoNest()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoNest::DeleteObject(BOOL bAll)
+void CAutoNest::DeleteObject(bool bAll)
{
CObject* fret;
@@ -96,14 +95,14 @@ void CAutoNest::Init() // Management of an event.
-BOOL CAutoNest::EventProcess(const Event &event)
+bool CAutoNest::EventProcess(const Event &event)
{
CObject* fret;
CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
@@ -143,7 +142,7 @@ BOOL CAutoNest::EventProcess(const Event &event) if ( fret != 0 )
{
fret->SetZoom(0, 1.0f);
- fret->SetLock(FALSE);
+ fret->SetLock(false);
}
m_phase = ANP_WAIT;
@@ -152,13 +151,13 @@ BOOL CAutoNest::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Seeks if a site is free.
-BOOL CAutoNest::SearchFree(D3DVECTOR pos)
+bool CAutoNest::SearchFree(D3DVECTOR pos)
{
CObject* pObj;
D3DVECTOR sPos;
@@ -179,11 +178,11 @@ BOOL CAutoNest::SearchFree(D3DVECTOR pos) {
distance = Length(sPos, pos);
distance -= sRadius;
- if ( distance < 2.0f ) return FALSE; // location occupied
+ if ( distance < 2.0f ) return false; // location occupied
}
}
- return TRUE; // free location
+ return true; // free location
}
// Create a transportable object.
@@ -198,7 +197,7 @@ void CAutoNest::CreateFret(D3DVECTOR pos, float angle, ObjectType type) delete fret;
return;
}
- fret->SetLock(TRUE); // not usable
+ fret->SetLock(true); // not usable
fret->SetZoom(0, 0.0f);
}
@@ -243,12 +242,12 @@ Error CAutoNest::RetError() // Saves all parameters of the controller.
-BOOL CAutoNest::Write(char *line)
+bool CAutoNest::Write(char *line)
{
D3DVECTOR pos;
char name[100];
- if ( m_phase == ANP_WAIT ) return FALSE;
+ if ( m_phase == ANP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -264,16 +263,16 @@ BOOL CAutoNest::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoNest::Read(char *line)
+bool CAutoNest::Read(char *line)
{
D3DVECTOR pos;
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -283,7 +282,7 @@ BOOL CAutoNest::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autonest.h b/src/object/auto/autonest.h index 1052462..55ee2f0 100644 --- a/src/object/auto/autonest.h +++ b/src/object/auto/autonest.h @@ -46,17 +46,17 @@ public: CAutoNest(CInstanceManager* iMan, CObject* object);
~CAutoNest();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
- BOOL SearchFree(D3DVECTOR pos);
+ bool SearchFree(D3DVECTOR pos);
void CreateFret(D3DVECTOR pos, float angle, ObjectType type);
CObject* SearchFret();
diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp index 160787b..a6a9904 100644 --- a/src/object/auto/autonuclear.cpp +++ b/src/object/auto/autonuclear.cpp @@ -63,13 +63,12 @@ CAutoNuclear::CAutoNuclear(CInstanceManager* iMan, CObject* object) CAutoNuclear::~CAutoNuclear()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoNuclear::DeleteObject(BOOL bAll)
+void CAutoNuclear::DeleteObject(bool bAll)
{
CObject* fret;
@@ -117,7 +116,7 @@ void CAutoNuclear::Init() // Management of an event.
-BOOL CAutoNuclear::EventProcess(const Event &event)
+bool CAutoNuclear::EventProcess(const Event &event)
{
CObject* fret;
D3DMATRIX* mat;
@@ -128,8 +127,8 @@ BOOL CAutoNuclear::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -140,7 +139,7 @@ BOOL CAutoNuclear::EventProcess(const Event &event) {
m_timeVirus = 0.1f+Rand()*0.3f;
}
- return TRUE;
+ return true;
}
EventProgress(event.rTime);
@@ -158,9 +157,9 @@ BOOL CAutoNuclear::EventProcess(const Event &event) }
else
{
- fret->SetLock(TRUE); // usable uranium
+ fret->SetLock(true); // usable uranium
- SetBusy(TRUE);
+ SetBusy(true);
InitProgressTotal(1.5f+NUCLEAR_DELAY+1.5f);
UpdateInterface();
@@ -202,7 +201,7 @@ BOOL CAutoNuclear::EventProcess(const Event &event) m_sound->Play(SOUND_CLOSE, m_object->RetPosition(0), 1.0f, 1.0f);
- m_channelSound = m_sound->Play(SOUND_NUCLEAR, m_object->RetPosition(0), 1.0f, 0.1f, TRUE);
+ m_channelSound = m_sound->Play(SOUND_NUCLEAR, m_object->RetPosition(0), 1.0f, 0.1f, true);
m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f, NUCLEAR_DELAY-1.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_channelSound, 0.0f, 1.0f, 2.0f, SOPER_STOP);
@@ -286,7 +285,7 @@ BOOL CAutoNuclear::EventProcess(const Event &event) {
m_object->SetAngleZ(1, 135.0f*PI/180.0f);
- SetBusy(FALSE);
+ SetBusy(false);
UpdateInterface();
m_displayText->DisplayError(INFO_NUCLEAR, m_object);
@@ -297,13 +296,13 @@ BOOL CAutoNuclear::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Creates all the interface when the object is selected.
-BOOL CAutoNuclear::CreateInterface(BOOL bSelect)
+bool CAutoNuclear::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -311,10 +310,10 @@ BOOL CAutoNuclear::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -327,7 +326,7 @@ BOOL CAutoNuclear::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 110, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
@@ -345,7 +344,7 @@ CObject* CAutoNuclear::SearchUranium() // Seeks if a vehicle is too close.
-BOOL CAutoNuclear::SearchVehicle()
+bool CAutoNuclear::SearchVehicle()
{
CObject* pObj;
D3DVECTOR oPos;
@@ -396,10 +395,10 @@ BOOL CAutoNuclear::SearchVehicle() if ( !pObj->GetCrashSphere(0, oPos, oRadius) ) continue;
dist = Length(oPos, m_pos)-oRadius;
- if ( dist < 10.0f ) return TRUE;
+ if ( dist < 10.0f ) return true;
}
- return FALSE;
+ return false;
}
// Creates an object stack.
@@ -458,12 +457,12 @@ Error CAutoNuclear::RetError() // Saves all parameters of the controller.
-BOOL CAutoNuclear::Write(char *line)
+bool CAutoNuclear::Write(char *line)
{
char name[100];
if ( m_phase == ANUP_STOP ||
- m_phase == ANUP_WAIT ) return FALSE;
+ m_phase == ANUP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -479,14 +478,14 @@ BOOL CAutoNuclear::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoNuclear::Read(char *line)
+bool CAutoNuclear::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -496,7 +495,7 @@ BOOL CAutoNuclear::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autonuclear.h b/src/object/auto/autonuclear.h index bdb828b..36b3483 100644 --- a/src/object/auto/autonuclear.h +++ b/src/object/auto/autonuclear.h @@ -49,20 +49,20 @@ public: CAutoNuclear(CInstanceManager* iMan, CObject* object);
~CAutoNuclear();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
CObject* SearchUranium();
- BOOL SearchVehicle();
+ bool SearchVehicle();
void CreatePower();
protected:
diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp index 464c9c2..1bc79ac 100644 --- a/src/object/auto/autopara.cpp +++ b/src/object/auto/autopara.cpp @@ -59,13 +59,12 @@ CAutoPara::CAutoPara(CInstanceManager* iMan, CObject* object) CAutoPara::~CAutoPara()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoPara::DeleteObject(BOOL bAll)
+void CAutoPara::DeleteObject(bool bAll)
{
if ( m_channelSound != -1 )
{
@@ -111,7 +110,7 @@ void CAutoPara::StartBlitz() // Management of an event.
-BOOL CAutoPara::EventProcess(const Event &event)
+bool CAutoPara::EventProcess(const Event &event)
{
D3DVECTOR pos, speed;
FPOINT dim;
@@ -119,8 +118,8 @@ BOOL CAutoPara::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -131,7 +130,7 @@ BOOL CAutoPara::EventProcess(const Event &event) {
m_timeVirus = 0.1f+Rand()*0.3f;
}
- return TRUE;
+ return true;
}
EventProgress(event.rTime);
@@ -198,13 +197,13 @@ BOOL CAutoPara::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Creates all the interface when the object is selected.
-BOOL CAutoPara::CreateInterface(BOOL bSelect)
+bool CAutoPara::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -212,10 +211,10 @@ BOOL CAutoPara::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -234,7 +233,7 @@ BOOL CAutoPara::CreateInterface(BOOL bSelect) ddim.y = 33.0f/480.0f;
pw->CreateButton(pos, ddim, 41, EVENT_OBJECT_LIMIT);
- return TRUE;
+ return true;
}
@@ -302,11 +301,11 @@ void CAutoPara::ChargeObject(float rTime) // Saves all parameters of the controller.
-BOOL CAutoPara::Write(char *line)
+bool CAutoPara::Write(char *line)
{
char name[100];
- if ( m_phase == APAP_WAIT ) return FALSE;
+ if ( m_phase == APAP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -322,14 +321,14 @@ BOOL CAutoPara::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoPara::Read(char *line)
+bool CAutoPara::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -339,7 +338,7 @@ BOOL CAutoPara::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autopara.h b/src/object/auto/autopara.h index 813d5d5..9eab4d7 100644 --- a/src/object/auto/autopara.h +++ b/src/object/auto/autopara.h @@ -47,17 +47,17 @@ public: CAutoPara(CInstanceManager* iMan, CObject* object);
~CAutoPara();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
void StartBlitz();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
void ChargeObject(float rTime);
diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp index 302b8a6..97f11c5 100644 --- a/src/object/auto/autoportico.cpp +++ b/src/object/auto/autoportico.cpp @@ -86,13 +86,12 @@ CAutoPortico::CAutoPortico(CInstanceManager* iMan, CObject* object) CAutoPortico::~CAutoPortico()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoPortico::DeleteObject(BOOL bAll)
+void CAutoPortico::DeleteObject(bool bAll)
{
if ( m_soundChannel != -1 )
{
@@ -152,7 +151,7 @@ void CAutoPortico::Start(int param) // Management of an event.
-BOOL CAutoPortico::EventProcess(const Event &event)
+bool CAutoPortico::EventProcess(const Event &event)
{
CObject* pObj;
D3DVECTOR pos;
@@ -160,7 +159,7 @@ BOOL CAutoPortico::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
if ( m_phase == APOP_START )
{
@@ -168,7 +167,7 @@ BOOL CAutoPortico::EventProcess(const Event &event) {
m_startPos = m_object->RetPosition(0);
- m_soundChannel = m_sound->Play(SOUND_MOTORr, m_object->RetPosition(0), 0.0f, 0.3f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MOTORr, m_object->RetPosition(0), 0.0f, 0.3f, true);
m_sound->AddEnvelope(m_soundChannel, 0.5f, 0.6f, 0.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.5f, 0.6f, PORTICO_TIME_MOVE-0.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.3f, 0.5f, SOPER_STOP);
@@ -177,7 +176,7 @@ BOOL CAutoPortico::EventProcess(const Event &event) m_progress = 0.0f;
m_speed = 1.0f/PORTICO_TIME_MOVE;
- m_main->SetMovieLock(TRUE); // blocks everything until the end of the landing
+ m_main->SetMovieLock(true); // blocks everything until the end of the landing
m_camera->SetType(CAMERA_SCRIPT);
@@ -207,8 +206,8 @@ BOOL CAutoPortico::EventProcess(const Event &event) angle = sinf(m_time*4.0f)*0.3f;
m_object->SetAngleX(11, angle);
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_phase == APOP_WAIT ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_phase == APOP_WAIT ) return true;
m_progress += event.rTime*m_speed;
m_cameraProgress += event.rTime*m_cameraSpeed;
@@ -236,7 +235,7 @@ BOOL CAutoPortico::EventProcess(const Event &event) {
if ( m_progress >= 1.0f )
{
- m_soundChannel = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, true);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 0.5f, 1.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.3f, 0.6f, PORTICO_TIME_DOWN-1.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.3f, 1.0f, SOPER_STOP);
@@ -273,12 +272,12 @@ BOOL CAutoPortico::EventProcess(const Event &event) {
if ( m_progress >= 1.0f )
{
- m_soundChannel = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.5f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.5f, true);
m_sound->AddEnvelope(m_soundChannel, 0.5f, 1.0f, 0.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.5f, 1.0f, PORTICO_TIME_OPEN/2.0f-0.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 0.5f, SOPER_STOP);
- m_soundChannel = m_sound->Play(SOUND_MOTORr, m_object->RetPosition(0), 0.0f, 0.3f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MOTORr, m_object->RetPosition(0), 0.0f, 0.3f, true);
m_sound->AddEnvelope(m_soundChannel, 0.5f, 0.6f, 0.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.5f, 0.6f, PORTICO_TIME_OPEN-0.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.3f, 0.5f, SOPER_STOP);
@@ -324,7 +323,7 @@ BOOL CAutoPortico::EventProcess(const Event &event) }
else
{
- m_main->SetMovieLock(FALSE); // you can play!
+ m_main->SetMovieLock(false); // you can play!
pObj = m_main->SearchHuman();
m_main->SelectObject(pObj);
@@ -365,12 +364,12 @@ BOOL CAutoPortico::EventProcess(const Event &event) m_camera->SetScriptLookat(pos);
}
- return TRUE;
+ return true;
}
// Stops the controller.
-BOOL CAutoPortico::Abort()
+bool CAutoPortico::Abort()
{
CObject* pObj;
@@ -383,7 +382,7 @@ BOOL CAutoPortico::Abort() m_object->SetAngleY(6, -PORTICO_ANGLE2b);
m_object->SetAngleY(7, -PORTICO_ANGLE3b);
- m_main->SetMovieLock(FALSE); // you can play!
+ m_main->SetMovieLock(false); // you can play!
pObj = m_main->SearchHuman();
m_main->SelectObject(pObj);
@@ -401,7 +400,7 @@ BOOL CAutoPortico::Abort() m_progress = 0.0f;
m_speed = 1.0f/2.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autoportico.h b/src/object/auto/autoportico.h index 3a5e99b..196140d 100644 --- a/src/object/auto/autoportico.h +++ b/src/object/auto/autoportico.h @@ -51,12 +51,12 @@ public: CAutoPortico(CInstanceManager* iMan, CObject* object);
~CAutoPortico();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
void Start(int param);
- BOOL EventProcess(const Event &event);
- BOOL Abort();
+ bool EventProcess(const Event &event);
+ bool Abort();
Error RetError();
protected:
diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index cf33cf6..e0567fc 100644 --- a/src/object/auto/autoradar.cpp +++ b/src/object/auto/autoradar.cpp @@ -57,13 +57,12 @@ CAutoRadar::CAutoRadar(CInstanceManager* iMan, CObject* object) CAutoRadar::~CAutoRadar()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoRadar::DeleteObject(BOOL bAll)
+void CAutoRadar::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -85,16 +84,16 @@ void CAutoRadar::Init() // Management of an event.
-BOOL CAutoRadar::EventProcess(const Event &event)
+bool CAutoRadar::EventProcess(const Event &event)
{
D3DVECTOR pos, ePos;
float speed, angle, prog, freq, ampl;
CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_phase == ARAP_WAIT ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_phase == ARAP_WAIT ) return true;
m_progress += event.rTime*m_speed;
m_aTime += event.rTime;
@@ -119,7 +118,7 @@ BOOL CAutoRadar::EventProcess(const Event &event) m_totalDetect = (int)(Rand()*10.0f);
UpdateInterface();
}
- return TRUE;
+ return true;
}
if ( m_phase == ARAP_SEARCH )
@@ -196,7 +195,7 @@ BOOL CAutoRadar::EventProcess(const Event &event) angle = sinf(m_aTime*4.0f)*0.3f;
m_object->SetAngleX(3, angle);
- return TRUE;
+ return true;
}
@@ -215,7 +214,7 @@ Error CAutoRadar::RetError() // Creates all the interface when the object is selected.
-BOOL CAutoRadar::CreateInterface(BOOL bSelect)
+bool CAutoRadar::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, dim, ddim;
@@ -223,10 +222,10 @@ BOOL CAutoRadar::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -246,7 +245,7 @@ BOOL CAutoRadar::CreateInterface(BOOL bSelect) pw->CreateGroup(pos, ddim, 105, EVENT_OBJECT_TYPE);
UpdateInterface();
- return TRUE;
+ return true;
}
// Updates the status of all interface buttons.
@@ -276,7 +275,7 @@ void CAutoRadar::UpdateInterface() // Seeking the position of an enemy.
-BOOL CAutoRadar::SearchEnemy(D3DVECTOR &pos)
+bool CAutoRadar::SearchEnemy(D3DVECTOR &pos)
{
CObject* pObj;
CObject* pBest = 0;
@@ -316,9 +315,9 @@ BOOL CAutoRadar::SearchEnemy(D3DVECTOR &pos) UpdateInterface();
- if ( pBest == 0 ) return FALSE;
+ if ( pBest == 0 ) return false;
pos = pBest->RetPosition(0);
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autoradar.h b/src/object/auto/autoradar.h index 18ba5a8..616a6eb 100644 --- a/src/object/auto/autoradar.h +++ b/src/object/auto/autoradar.h @@ -48,16 +48,16 @@ public: CAutoRadar(CInstanceManager* iMan, CObject* object);
~CAutoRadar();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
- BOOL CreateInterface(BOOL bSelect);
+ bool EventProcess(const Event &event);
+ bool CreateInterface(bool bSelect);
Error RetError();
protected:
void UpdateInterface();
- BOOL SearchEnemy(D3DVECTOR &pos);
+ bool SearchEnemy(D3DVECTOR &pos);
protected:
AutoRadarPhase m_phase;
diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index e6a0603..05469c4 100644 --- a/src/object/auto/autorepair.cpp +++ b/src/object/auto/autorepair.cpp @@ -60,13 +60,12 @@ CAutoRepair::CAutoRepair(CInstanceManager* iMan, CObject* object) CAutoRepair::~CAutoRepair()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoRepair::DeleteObject(BOOL bAll)
+void CAutoRepair::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -90,7 +89,7 @@ void CAutoRepair::Init() // Management of an event.
-BOOL CAutoRepair::EventProcess(const Event &event)
+bool CAutoRepair::EventProcess(const Event &event)
{
CObject* vehicule;
D3DVECTOR pos, speed;
@@ -99,8 +98,8 @@ BOOL CAutoRepair::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -111,7 +110,7 @@ BOOL CAutoRepair::EventProcess(const Event &event) {
m_timeVirus = 0.1f+Rand()*0.3f;
}
- return TRUE;
+ return true;
}
if ( m_phase == ARP_WAIT )
@@ -210,13 +209,13 @@ BOOL CAutoRepair::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Creates all the interface when the object is selected.
-BOOL CAutoRepair::CreateInterface(BOOL bSelect)
+bool CAutoRepair::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -224,10 +223,10 @@ BOOL CAutoRepair::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -240,7 +239,7 @@ BOOL CAutoRepair::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 106, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
@@ -318,11 +317,11 @@ Error CAutoRepair::RetError() // Saves all parameters of the controller.
-BOOL CAutoRepair::Write(char *line)
+bool CAutoRepair::Write(char *line)
{
char name[100];
- if ( m_phase == ARP_WAIT ) return FALSE;
+ if ( m_phase == ARP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -338,14 +337,14 @@ BOOL CAutoRepair::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoRepair::Read(char *line)
+bool CAutoRepair::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -355,7 +354,7 @@ BOOL CAutoRepair::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autorepair.h b/src/object/auto/autorepair.h index 9f5cc5e..6d52c7a 100644 --- a/src/object/auto/autorepair.h +++ b/src/object/auto/autorepair.h @@ -49,16 +49,16 @@ public: CAutoRepair(CInstanceManager* iMan, CObject* object);
~CAutoRepair();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
CObject* SearchVehicle();
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index 735d6cd..e5305b5 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -71,13 +71,12 @@ CAutoResearch::CAutoResearch(CInstanceManager* iMan, CObject* object) CAutoResearch::~CAutoResearch()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoResearch::DeleteObject(BOOL bAll)
+void CAutoResearch::DeleteObject(bool bAll)
{
if ( m_channelSound != -1 )
{
@@ -86,7 +85,7 @@ void CAutoResearch::DeleteObject(BOOL bAll) m_channelSound = -1;
}
- FireStopUpdate(0.0f, FALSE);
+ FireStopUpdate(0.0f, false);
CAuto::DeleteObject(bAll);
}
@@ -108,7 +107,7 @@ void CAutoResearch::Init() // Management of an event.
-BOOL CAutoResearch::EventProcess(const Event &event)
+bool CAutoResearch::EventProcess(const Event &event)
{
CObject* power;
D3DVECTOR pos, speed;
@@ -118,11 +117,11 @@ BOOL CAutoResearch::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
if ( event.event == EVENT_UPDINTERFACE )
{
- if ( m_object->RetSelect() ) CreateInterface(TRUE);
+ if ( m_object->RetSelect() ) CreateInterface(true);
}
if ( m_object->RetSelect() && // center selected?
@@ -137,7 +136,7 @@ BOOL CAutoResearch::EventProcess(const Event &event) {
if ( m_phase != ALP_WAIT )
{
- return FALSE;
+ return false;
}
m_research = event.event;
@@ -145,24 +144,24 @@ BOOL CAutoResearch::EventProcess(const Event &event) if ( TestResearch(m_research) )
{
m_displayText->DisplayError(ERR_RESEARCH_ALREADY, m_object);
- return FALSE;
+ return false;
}
power = m_object->RetPower();
if ( power == 0 )
{
m_displayText->DisplayError(ERR_RESEARCH_POWER, m_object);
- return FALSE;
+ return false;
}
if ( power->RetCapacity() > 1.0f )
{
m_displayText->DisplayError(ERR_RESEARCH_TYPE, m_object);
- return FALSE;
+ return false;
}
if ( power->RetEnergy() < 1.0f )
{
m_displayText->DisplayError(ERR_RESEARCH_ENERGY, m_object);
- return FALSE;
+ return false;
}
time = SEARCH_TIME;
@@ -170,11 +169,11 @@ BOOL CAutoResearch::EventProcess(const Event &event) if ( event.event == EVENT_OBJECT_RFLY ) time *= 0.3f;
if ( event.event == EVENT_OBJECT_RATOMIC ) time *= 2.0f;
- SetBusy(TRUE);
+ SetBusy(true);
InitProgressTotal(time);
UpdateInterface();
- m_channelSound = m_sound->Play(SOUND_RESEARCH, m_object->RetPosition(0), 0.0f, 1.0f, TRUE);
+ m_channelSound = m_sound->Play(SOUND_RESEARCH, m_object->RetPosition(0), 0.0f, 1.0f, true);
m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f, 2.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f, time-4.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_channelSound, 0.0f, 1.0f, 2.0f, SOPER_STOP);
@@ -182,10 +181,10 @@ BOOL CAutoResearch::EventProcess(const Event &event) m_phase = ALP_SEARCH;
m_progress = 0.0f;
m_speed = 1.0f/time;
- return TRUE;
+ return true;
}
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -196,7 +195,7 @@ BOOL CAutoResearch::EventProcess(const Event &event) {
m_timeVirus = 0.1f+Rand()*0.3f;
}
- return TRUE;
+ return true;
}
UpdateInterface(event.rTime);
@@ -210,25 +209,25 @@ BOOL CAutoResearch::EventProcess(const Event &event) if ( m_phase == ALP_WAIT )
{
- FireStopUpdate(m_progress, FALSE); // extinguished
- return TRUE;
+ FireStopUpdate(m_progress, false); // extinguished
+ return true;
}
if ( m_phase == ALP_SEARCH )
{
- FireStopUpdate(m_progress, TRUE); // flashes
+ FireStopUpdate(m_progress, true); // flashes
if ( m_progress < 1.0f )
{
power = m_object->RetPower();
if ( power == 0 ) // more battery?
{
- SetBusy(FALSE);
+ SetBusy(false);
UpdateInterface();
m_phase = ALP_WAIT;
m_progress = 0.0f;
m_speed = 1.0f/1.0f;
- return TRUE;
+ return true;
}
power->SetEnergy(1.0f-m_progress);
@@ -267,7 +266,7 @@ BOOL CAutoResearch::EventProcess(const Event &event) m_displayText->DisplayError(message, m_object);
}
- SetBusy(FALSE);
+ SetBusy(false);
UpdateInterface();
m_phase = ALP_WAIT;
@@ -276,7 +275,7 @@ BOOL CAutoResearch::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -316,7 +315,7 @@ Error CAutoResearch::RetError() // Creates all the interface when the object is selected.
-BOOL CAutoResearch::CreateInterface(BOOL bSelect)
+bool CAutoResearch::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, dim, ddim;
@@ -324,10 +323,10 @@ BOOL CAutoResearch::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
dim.x = 33.0f/640.0f;
dim.y = 33.0f/480.0f;
@@ -382,7 +381,7 @@ BOOL CAutoResearch::CreateInterface(BOOL bSelect) UpdateInterface();
- return TRUE;
+ return true;
}
// Updates the status of all interface buttons.
@@ -474,7 +473,7 @@ void CAutoResearch::OkayButton(CWindow *pw, EventMsg event) // Test whether a search has already been done.
-BOOL CAutoResearch::TestResearch(EventMsg event)
+bool CAutoResearch::TestResearch(EventMsg event)
{
if ( event == EVENT_OBJECT_RTANK ) return (g_researchDone & RESEARCH_TANK );
if ( event == EVENT_OBJECT_RFLY ) return (g_researchDone & RESEARCH_FLY );
@@ -485,7 +484,7 @@ BOOL CAutoResearch::TestResearch(EventMsg event) if ( event == EVENT_OBJECT_RSHIELD ) return (g_researchDone & RESEARCH_SHIELD);
if ( event == EVENT_OBJECT_RATOMIC ) return (g_researchDone & RESEARCH_ATOMIC);
- return FALSE;
+ return false;
}
// Indicates a search as made.
@@ -513,7 +512,7 @@ void CAutoResearch::SetResearch(EventMsg event) // Updates the stop lights.
-void CAutoResearch::FireStopUpdate(float progress, BOOL bLightOn)
+void CAutoResearch::FireStopUpdate(float progress, bool bLightOn)
{
D3DMATRIX* mat;
D3DVECTOR pos, speed;
@@ -578,11 +577,11 @@ void CAutoResearch::FireStopUpdate(float progress, BOOL bLightOn) // Saves all parameters of the controller.
-BOOL CAutoResearch::Write(char *line)
+bool CAutoResearch::Write(char *line)
{
char name[100];
- if ( m_phase == ALP_WAIT ) return FALSE;
+ if ( m_phase == ALP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -601,14 +600,14 @@ BOOL CAutoResearch::Write(char *line) sprintf(name, " aResearch=%d", m_research);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoResearch::Read(char *line)
+bool CAutoResearch::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -620,7 +619,7 @@ BOOL CAutoResearch::Read(char *line) m_lastUpdateTime = 0.0f;
m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autoresearch.h b/src/object/auto/autoresearch.h index a8bfcb9..6a43570 100644 --- a/src/object/auto/autoresearch.h +++ b/src/object/auto/autoresearch.h @@ -46,24 +46,24 @@ public: CAutoResearch(CInstanceManager* iMan, CObject* object);
~CAutoResearch();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
void UpdateInterface();
void UpdateInterface(float rTime);
void OkayButton(CWindow *pw, EventMsg event);
- BOOL TestResearch(EventMsg event);
+ bool TestResearch(EventMsg event);
void SetResearch(EventMsg event);
- void FireStopUpdate(float progress, BOOL bLightOn);
+ void FireStopUpdate(float progress, bool bLightOn);
protected:
AutoResearchPhase m_phase;
diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp index f502e54..0ab12b8 100644 --- a/src/object/auto/autoroot.cpp +++ b/src/object/auto/autoroot.cpp @@ -50,13 +50,12 @@ CAutoRoot::CAutoRoot(CInstanceManager* iMan, CObject* object) CAutoRoot::~CAutoRoot()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoRoot::DeleteObject(BOOL bAll)
+void CAutoRoot::DeleteObject(bool bAll)
{
CAuto::DeleteObject(bAll);
}
@@ -89,15 +88,15 @@ void CAutoRoot::Init() // Management of an event.
-BOOL CAutoRoot::EventProcess(const Event &event)
+bool CAutoRoot::EventProcess(const Event &event)
{
D3DVECTOR pos, speed;
FPOINT dim;
CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_object->SetZoomX(1, 1.0f+sinf(m_time*2.0f)*0.2f);
m_object->SetZoomY(1, 1.0f+sinf(m_time*2.3f)*0.2f);
@@ -119,7 +118,7 @@ BOOL CAutoRoot::EventProcess(const Event &event) m_particule->CreateParticule(pos, speed, dim, PARTIROOT, 1.0f, 0.0f, 0.0f);
}
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autoroot.h b/src/object/auto/autoroot.h index 8b62d58..0be9b24 100644 --- a/src/object/auto/autoroot.h +++ b/src/object/auto/autoroot.h @@ -38,10 +38,10 @@ public: CAutoRoot(CInstanceManager* iMan, CObject* object);
~CAutoRoot();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
protected:
diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp index fc71cd9..8104c5e 100644 --- a/src/object/auto/autosafe.cpp +++ b/src/object/auto/autosafe.cpp @@ -60,11 +60,11 @@ CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object) for ( i=0 ; i<4 ; i++ )
{
- m_bKey[i] = FALSE;
+ m_bKey[i] = false;
m_keyParti[i] = -1;
}
- m_bLock = FALSE;
+ m_bLock = false;
m_lastParticule = 0.0f;
m_channelSound = -1;
Init();
@@ -74,13 +74,12 @@ CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object) CAutoSafe::~CAutoSafe()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoSafe::DeleteObject(BOOL bAll)
+void CAutoSafe::DeleteObject(bool bAll)
{
CObject* pObj;
@@ -124,7 +123,7 @@ void CAutoSafe::Init() // Management of an event.
-BOOL CAutoSafe::EventProcess(const Event &event)
+bool CAutoSafe::EventProcess(const Event &event)
{
CObject* pObj;
D3DVECTOR pos, speed;
@@ -133,8 +132,8 @@ BOOL CAutoSafe::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime;
@@ -145,7 +144,7 @@ BOOL CAutoSafe::EventProcess(const Event &event) {
m_timeVirus = 0.1f+Rand()*0.3f;
}
- return TRUE;
+ return true;
}
EventProgress(event.rTime);
@@ -155,9 +154,9 @@ BOOL CAutoSafe::EventProcess(const Event &event) pObj = SearchVehicle();
if ( pObj != 0 )
{
- pObj->SetLock(TRUE); // object not yet usable
+ pObj->SetLock(true); // object not yet usable
m_main->CreateShortcuts();
- m_bLock = TRUE;
+ m_bLock = true;
}
}
@@ -180,17 +179,17 @@ BOOL CAutoSafe::EventProcess(const Event &event) {
LockKeys();
- m_channelSound = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 1.0f, 0.25f, TRUE);
+ m_channelSound = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 1.0f, 0.25f, true);
m_sound->AddEnvelope(m_channelSound, 1.0f, 2.00f, OPEN_DELAY, SOPER_STOP);
m_phase = ASAP_OPEN;
m_progress = 0.0f;
m_speed = 1.0f/OPEN_DELAY;
- return TRUE;
+ return true;
}
else
{
- m_channelSound = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 1.0f, 0.25f, TRUE);
+ m_channelSound = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 1.0f, 0.25f, true);
m_sound->AddEnvelope(m_channelSound, 1.0f, 0.35f, 0.5f, SOPER_STOP);
}
}
@@ -253,7 +252,7 @@ BOOL CAutoSafe::EventProcess(const Event &event) pObj = SearchVehicle();
if ( pObj != 0 )
{
- pObj->SetLock(FALSE); // object usable
+ pObj->SetLock(false); // object usable
m_main->CreateShortcuts();
}
@@ -320,13 +319,13 @@ BOOL CAutoSafe::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
// Creates all the interface when the object is selected.
-BOOL CAutoSafe::CreateInterface(BOOL bSelect)
+bool CAutoSafe::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -334,10 +333,10 @@ BOOL CAutoSafe::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -350,7 +349,7 @@ BOOL CAutoSafe::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 114, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
@@ -368,11 +367,11 @@ Error CAutoSafe::RetError() // Saves all parameters of the controller.
-BOOL CAutoSafe::Write(char *line)
+bool CAutoSafe::Write(char *line)
{
char name[100];
- if ( m_phase == ASAP_WAIT ) return FALSE;
+ if ( m_phase == ASAP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -388,14 +387,14 @@ BOOL CAutoSafe::Write(char *line) sprintf(name, " aSpeed=%.2f", m_speed);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoSafe::Read(char *line)
+bool CAutoSafe::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -405,7 +404,7 @@ BOOL CAutoSafe::Read(char *line) m_lastParticule = 0.0f;
- return TRUE;
+ return true;
}
@@ -425,7 +424,7 @@ int CAutoSafe::CountKeys() for ( index=0 ; index<4 ; index++ )
{
- m_bKey[index] = FALSE;
+ m_bKey[index] = false;
m_keyPos[index] = cPos;
}
@@ -483,7 +482,7 @@ int CAutoSafe::CountKeys() pObj->SetAngleY(0, oAngle+cAngle);
m_keyPos[index] = oPos;
- m_bKey[index] = TRUE;
+ m_bKey[index] = true;
}
i = 0;
@@ -523,7 +522,7 @@ void CAutoSafe::LockKeys() dist = Length2d(oPos, cPos);
if ( dist > 20.0f ) continue;
- pObj->SetLock(TRUE);
+ pObj->SetLock(true);
}
}
@@ -570,13 +569,13 @@ void CAutoSafe::DeleteKeys() ObjectType oType;
float dist;
int i;
- BOOL bDelete;
+ bool bDelete;
cPos = m_object->RetPosition(0);
do
{
- bDelete = FALSE;
+ bDelete = false;
for ( i=0 ; i<1000000 ; i++ )
{
pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i);
@@ -596,7 +595,7 @@ void CAutoSafe::DeleteKeys() pObj->DeleteObject();
delete pObj;
- bDelete = TRUE;
+ bDelete = true;
}
}
while ( bDelete );
diff --git a/src/object/auto/autosafe.h b/src/object/auto/autosafe.h index 9cfaca0..2e43359 100644 --- a/src/object/auto/autosafe.h +++ b/src/object/auto/autosafe.h @@ -47,16 +47,16 @@ public: CAutoSafe(CInstanceManager* iMan, CObject* object);
~CAutoSafe();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
int CountKeys();
@@ -72,11 +72,11 @@ protected: float m_timeVirus;
float m_lastParticule;
int m_channelSound;
- BOOL m_bLock;
+ bool m_bLock;
int m_countKeys;
float m_actualAngle;
float m_finalAngle;
- BOOL m_bKey[4];
+ bool m_bKey[4];
D3DVECTOR m_keyPos[4];
int m_keyParti[4];
};
diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index 3d5f82a..ab26b6d 100644 --- a/src/object/auto/autostation.cpp +++ b/src/object/auto/autostation.cpp @@ -56,13 +56,12 @@ CAutoStation::CAutoStation(CInstanceManager* iMan, CObject* object) CAutoStation::~CAutoStation()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoStation::DeleteObject(BOOL bAll)
+void CAutoStation::DeleteObject(bool bAll)
{
if ( m_soundChannel != -1 )
{
@@ -83,7 +82,7 @@ void CAutoStation::Init() m_lastUpdateTime = 0.0f;
m_lastParticule = 0.0f;
m_soundChannel = -1;
- m_bLastVirus = FALSE;
+ m_bLastVirus = false;
CAuto::Init();
}
@@ -91,7 +90,7 @@ void CAutoStation::Init() // Management of an event.
-BOOL CAutoStation::EventProcess(const Event &event)
+bool CAutoStation::EventProcess(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR pos, ppos, speed;
@@ -103,8 +102,8 @@ BOOL CAutoStation::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_timeVirus -= event.rTime;
@@ -112,7 +111,7 @@ BOOL CAutoStation::EventProcess(const Event &event) {
if ( !m_bLastVirus )
{
- m_bLastVirus = TRUE;
+ m_bLastVirus = true;
m_energyVirus = m_object->RetEnergy();
}
@@ -122,13 +121,13 @@ BOOL CAutoStation::EventProcess(const Event &event) m_object->SetEnergy(Rand());
}
- return TRUE;
+ return true;
}
else
{
if ( m_bLastVirus )
{
- m_bLastVirus = FALSE;
+ m_bLastVirus = false;
m_object->SetEnergy(m_energyVirus);
}
}
@@ -185,7 +184,7 @@ BOOL CAutoStation::EventProcess(const Event &event) if ( m_soundChannel == -1 )
{
m_soundChannel = m_sound->Play(SOUND_STATION, m_object->RetPosition(0),
- 0.3f, freq, TRUE);
+ 0.3f, freq, true);
}
m_sound->Frequency(m_soundChannel, freq);
}
@@ -245,7 +244,7 @@ BOOL CAutoStation::EventProcess(const Event &event) if ( big > 1.0f ) big = 1.0f;
m_object->SetEnergy(big); // Shift the large battery
- return TRUE;
+ return true;
}
@@ -324,7 +323,7 @@ Error CAutoStation::RetError() // Crée toute l'interface lorsque l'objet est sélectionné .
-BOOL CAutoStation::CreateInterface(BOOL bSelect)
+bool CAutoStation::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -332,10 +331,10 @@ BOOL CAutoStation::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -354,7 +353,7 @@ BOOL CAutoStation::CreateInterface(BOOL bSelect) ddim.y = 66.0f/480.0f;
pw->CreateGroup(pos, ddim, 104, EVENT_OBJECT_TYPE);
- return TRUE;
+ return true;
}
// Updates the state of all buttons on the interface,
diff --git a/src/object/auto/autostation.h b/src/object/auto/autostation.h index 40ad57b..04f6b46 100644 --- a/src/object/auto/autostation.h +++ b/src/object/auto/autostation.h @@ -38,13 +38,13 @@ public: CAutoStation(CInstanceManager* iMan, CObject* object);
~CAutoStation();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
protected:
void UpdateInterface(float rTime);
@@ -59,7 +59,7 @@ protected: float m_lastParticule;
int m_soundChannel;
D3DVECTOR m_fretPos;
- BOOL m_bLastVirus;
+ bool m_bLastVirus;
float m_energyVirus;
};
diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index ea3cd54..63222b8 100644 --- a/src/object/auto/autotower.cpp +++ b/src/object/auto/autotower.cpp @@ -73,15 +73,14 @@ CAutoTower::CAutoTower(CInstanceManager* iMan, CObject* object) CAutoTower::~CAutoTower()
{
- this->CAuto::~CAuto();
}
// Destroys the object.
-void CAutoTower::DeleteObject(BOOL bAll)
+void CAutoTower::DeleteObject(bool bAll)
{
- FireStopUpdate(0.0f, FALSE);
+ FireStopUpdate(0.0f, false);
CAuto::DeleteObject(bAll);
}
@@ -103,7 +102,7 @@ void CAutoTower::Init() // Management of an event.
-BOOL CAutoTower::EventProcess(const Event &event)
+bool CAutoTower::EventProcess(const Event &event)
{
CObject* power;
CObject* target;
@@ -112,8 +111,8 @@ BOOL CAutoTower::EventProcess(const Event &event) CAuto::EventProcess(event);
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_timeVirus -= event.rTime;
@@ -129,18 +128,18 @@ BOOL CAutoTower::EventProcess(const Event &event) m_object->SetAngleZ(2, Rand()*0.5f);
}
- return TRUE;
+ return true;
}
UpdateInterface(event.rTime);
- if ( m_phase == ATP_WAIT ) return TRUE;
+ if ( m_phase == ATP_WAIT ) return true;
m_progress += event.rTime*m_speed;
if ( m_phase == ATP_ZERO )
{
- FireStopUpdate(m_progress, TRUE); // blinks
+ FireStopUpdate(m_progress, true); // blinks
if ( m_progress < 1.0f )
{
energy = 0.0f;
@@ -166,7 +165,7 @@ BOOL CAutoTower::EventProcess(const Event &event) if ( m_phase == ATP_SEARCH )
{
- FireStopUpdate(m_progress, FALSE); // extinguished
+ FireStopUpdate(m_progress, false); // extinguished
if ( m_progress < 1.0f )
{
quick = 1.0f;
@@ -270,7 +269,7 @@ BOOL CAutoTower::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -304,7 +303,7 @@ CObject* CAutoTower::SearchTarget(D3DVECTOR &impact) if ( !pObj->RetActif() ) continue; // inactive?
//? if ( g_researchDone & RESEARCH_QUICK )
- if ( FALSE )
+ if ( false )
{
physics = pObj->RetPhysics();
if ( physics != 0 )
@@ -359,7 +358,7 @@ Error CAutoTower::RetError() // Updates the stop lights.
-void CAutoTower::FireStopUpdate(float progress, BOOL bLightOn)
+void CAutoTower::FireStopUpdate(float progress, bool bLightOn)
{
D3DMATRIX* mat;
D3DVECTOR pos, speed;
@@ -422,7 +421,7 @@ void CAutoTower::FireStopUpdate(float progress, BOOL bLightOn) // Creates all the interface when the object is selected.
-BOOL CAutoTower::CreateInterface(BOOL bSelect)
+bool CAutoTower::CreateInterface(bool bSelect)
{
CWindow* pw;
FPOINT pos, ddim;
@@ -430,10 +429,10 @@ BOOL CAutoTower::CreateInterface(BOOL bSelect) CAuto::CreateInterface(bSelect);
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
ox = 3.0f/640.0f;
oy = 3.0f/480.0f;
@@ -458,7 +457,7 @@ BOOL CAutoTower::CreateInterface(BOOL bSelect) ddim.y = 33.0f/480.0f;
pw->CreateButton(pos, ddim, 41, EVENT_OBJECT_LIMIT);
- return TRUE;
+ return true;
}
// Updates the state of all buttons on the interface,
@@ -497,11 +496,11 @@ void CAutoTower::UpdateInterface(float rTime) // Saves all parameters of the controller.
-BOOL CAutoTower::Write(char *line)
+bool CAutoTower::Write(char *line)
{
char name[100];
- if ( m_phase == ATP_WAIT ) return FALSE;
+ if ( m_phase == ATP_WAIT ) return false;
sprintf(name, " aExist=%d", 1);
strcat(line, name);
@@ -532,14 +531,14 @@ BOOL CAutoTower::Write(char *line) sprintf(name, " aAngleZfinal=%.2f", m_angleZfinal);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the controller.
-BOOL CAutoTower::Read(char *line)
+bool CAutoTower::Read(char *line)
{
- if ( OpInt(line, "aExist", 0) == 0 ) return FALSE;
+ if ( OpInt(line, "aExist", 0) == 0 ) return false;
CAuto::Read(line);
@@ -554,7 +553,7 @@ BOOL CAutoTower::Read(char *line) m_lastUpdateTime = 0.0f;
- return TRUE;
+ return true;
}
diff --git a/src/object/auto/autotower.h b/src/object/auto/autotower.h index 64448d3..cf4fc3b 100644 --- a/src/object/auto/autotower.h +++ b/src/object/auto/autotower.h @@ -49,22 +49,22 @@ public: CAutoTower(CInstanceManager* iMan, CObject* object);
~CAutoTower();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Init();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error RetError();
- BOOL CreateInterface(BOOL bSelect);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
protected:
void UpdateInterface(float rTime);
CObject* SearchTarget(D3DVECTOR &impact);
- void FireStopUpdate(float progress, BOOL bLightOn);
+ void FireStopUpdate(float progress, bool bLightOn);
protected:
AutoTowerPhase m_phase;
diff --git a/src/object/brain.cpp b/src/object/brain.cpp index 698f4d8..1bbebe4 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -99,9 +99,9 @@ CBrain::CBrain(CInstanceManager* iMan, CObject* object) m_studio = 0;
m_program = -1;
- m_bActivity = TRUE;
- m_bBurn = FALSE;
- m_bActiveVirus = FALSE;
+ m_bActivity = true;
+ m_bBurn = false;
+ m_bActiveVirus = false;
m_time = 0.0f;
m_burnTime = 0.0f;
m_lastUpdateTime = 0.0f;
@@ -126,7 +126,7 @@ CBrain::CBrain(CInstanceManager* iMan, CObject* object) m_soluceName[0] = 0;
m_selScript = 0;
- m_bTraceRecord = FALSE;
+ m_bTraceRecord = false;
m_traceRecordBuffer = 0;
}
@@ -151,7 +151,7 @@ CBrain::~CBrain() // Destroys the object.
-void CBrain::DeleteObject(BOOL bAll)
+void CBrain::DeleteObject(bool bAll)
{
if ( m_soundChannelAlarm != -1 )
{
@@ -172,7 +172,7 @@ void CBrain::DeleteObject(BOOL bAll) if ( m_studio != 0 ) // current edition?
{
- StopEditScript(TRUE);
+ StopEditScript(true);
}
}
@@ -190,29 +190,29 @@ void CBrain::SetMotion(CMotion* motion) // Saves all parameters of the object.
-BOOL CBrain::Write(char *line)
+bool CBrain::Write(char *line)
{
char name[100];
sprintf(name, " bVirusActive=%d", m_bActiveVirus);
strcat(line, name);
- return TRUE;
+ return true;
}
// Restores all parameters of the object.
-BOOL CBrain::Read(char *line)
+bool CBrain::Read(char *line)
{
m_bActiveVirus = OpInt(line, "bVirusActive", 0);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CBrain::EventProcess(const Event &event)
+bool CBrain::EventProcess(const Event &event)
{
CWindow* pw;
CControl* pc;
@@ -259,11 +259,11 @@ BOOL CBrain::EventProcess(const Event &event) action = event.event;
}
- if ( action == EVENT_NULL ) return TRUE;
+ if ( action == EVENT_NULL ) return true;
if ( action == EVENT_UPDINTERFACE )
{
- if ( m_object->RetSelect() ) CreateInterface(TRUE);
+ if ( m_object->RetSelect() ) CreateInterface(true);
}
if ( action == EVENT_FRAME )
@@ -298,15 +298,15 @@ BOOL CBrain::EventProcess(const Event &event) }
if ( action == EVENT_STUDIO_OK )
{
- StopEditScript(FALSE);
+ StopEditScript(false);
m_main->SaveOneScript(m_object);
}
if ( action == EVENT_STUDIO_CANCEL )
{
- StopEditScript(TRUE);
+ StopEditScript(true);
m_main->SaveOneScript(m_object);
}
- return TRUE;
+ return true;
}
if ( !m_object->RetSelect() && // robot pas sélectionné ?
@@ -320,7 +320,7 @@ BOOL CBrain::EventProcess(const Event &event) {
if ( !m_bBurn ) // beginning?
{
- m_bBurn = TRUE;
+ m_bBurn = true;
m_burnTime = 0.0f;
}
@@ -345,19 +345,19 @@ BOOL CBrain::EventProcess(const Event &event) m_physics->SetMotorSpeedX(axeY); // move forward/move back
m_physics->SetMotorSpeedY(axeZ); // up / down
m_physics->SetMotorSpeedZ(axeX); // rotate
- return TRUE;
+ return true;
}
if ( m_program != -1 &&
m_object->RetRuin() )
{
StopProgram();
- return TRUE;
+ return true;
}
if ( !m_object->RetSelect() ) // robot not selected?
{
- return TRUE;
+ return true;
}
if ( m_secondaryTask != 0 ) // current task?
@@ -378,7 +378,7 @@ BOOL CBrain::EventProcess(const Event &event) {
StartEditScript(m_selScript, m_main->RetScriptName());
}
- if ( m_primaryTask == 0 || !m_primaryTask->IsPilot() ) return TRUE;
+ if ( m_primaryTask == 0 || !m_primaryTask->IsPilot() ) return true;
}
if ( action == EVENT_OBJECT_LEFT ||
@@ -623,55 +623,55 @@ BOOL CBrain::EventProcess(const Event &event) if ( action == EVENT_OBJECT_PEN0 ) // up
{
- err = StartTaskPen(FALSE, m_object->RetTraceColor());
- m_object->SetTraceDown(FALSE);
+ err = StartTaskPen(false, m_object->RetTraceColor());
+ m_object->SetTraceDown(false);
}
if ( action == EVENT_OBJECT_PEN1 ) // black
{
- err = StartTaskPen(TRUE, 1);
- m_object->SetTraceDown(TRUE);
+ err = StartTaskPen(true, 1);
+ m_object->SetTraceDown(true);
m_object->SetTraceColor(1);
}
if ( action == EVENT_OBJECT_PEN2 ) // yellow
{
- err = StartTaskPen(TRUE, 8);
- m_object->SetTraceDown(TRUE);
+ err = StartTaskPen(true, 8);
+ m_object->SetTraceDown(true);
m_object->SetTraceColor(8);
}
if ( action == EVENT_OBJECT_PEN3 ) // orange
{
- err = StartTaskPen(TRUE, 7);
- m_object->SetTraceDown(TRUE);
+ err = StartTaskPen(true, 7);
+ m_object->SetTraceDown(true);
m_object->SetTraceColor(7);
}
if ( action == EVENT_OBJECT_PEN4 ) // red
{
- err = StartTaskPen(TRUE, 4);
- m_object->SetTraceDown(TRUE);
+ err = StartTaskPen(true, 4);
+ m_object->SetTraceDown(true);
m_object->SetTraceColor(4);
}
if ( action == EVENT_OBJECT_PEN5 ) // violet
{
- err = StartTaskPen(TRUE, 6);
- m_object->SetTraceDown(TRUE);
+ err = StartTaskPen(true, 6);
+ m_object->SetTraceDown(true);
m_object->SetTraceColor(6);
}
if ( action == EVENT_OBJECT_PEN6 ) // blue
{
- err = StartTaskPen(TRUE, 14);
- m_object->SetTraceDown(TRUE);
+ err = StartTaskPen(true, 14);
+ m_object->SetTraceDown(true);
m_object->SetTraceColor(14);
}
if ( action == EVENT_OBJECT_PEN7 ) // green
{
- err = StartTaskPen(TRUE, 12);
- m_object->SetTraceDown(TRUE);
+ err = StartTaskPen(true, 12);
+ m_object->SetTraceDown(true);
m_object->SetTraceColor(12);
}
if ( action == EVENT_OBJECT_PEN8 ) // brown
{
- err = StartTaskPen(TRUE, 10);
- m_object->SetTraceDown(TRUE);
+ err = StartTaskPen(true, 10);
+ m_object->SetTraceDown(true);
m_object->SetTraceColor(10);
}
@@ -679,12 +679,12 @@ BOOL CBrain::EventProcess(const Event &event) {
if ( m_bTraceRecord )
{
- m_bTraceRecord = FALSE;
+ m_bTraceRecord = false;
TraceRecordStop();
}
else
{
- m_bTraceRecord = TRUE;
+ m_bTraceRecord = true;
TraceRecordStart();
}
UpdateInterface();
@@ -698,7 +698,7 @@ BOOL CBrain::EventProcess(const Event &event) {
if ( m_bTraceRecord )
{
- m_bTraceRecord = FALSE;
+ m_bTraceRecord = false;
TraceRecordStop();
}
UpdateInterface();
@@ -750,13 +750,13 @@ BOOL CBrain::EventProcess(const Event &event) m_displayText->DisplayError(err, m_object);
}
- return TRUE;
+ return true;
}
// The brain is changing by time.
-BOOL CBrain::EventFrame(const Event &event)
+bool CBrain::EventFrame(const Event &event)
{
m_time += event.rTime;
if ( m_bBurn ) m_burnTime += event.rTime;
@@ -773,9 +773,9 @@ BOOL CBrain::EventFrame(const Event &event) UpdateInterface(event.rTime);
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_bActivity ) return TRUE; // expected if idle
- if ( EndedTask() == ERR_CONTINUE ) return TRUE; // expected if not finished ...
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_bActivity ) return true; // expected if idle
+ if ( EndedTask() == ERR_CONTINUE ) return true; // expected if not finished ...
if ( m_program != -1 ) // current program?
{
@@ -790,7 +790,7 @@ BOOL CBrain::EventFrame(const Event &event) TraceRecordFrame();
}
- return TRUE;
+ return true;
}
@@ -809,7 +809,7 @@ void CBrain::StopProgram() m_script[m_program]->Stop();
}
- BlinkScript(FALSE); // stops flashing
+ BlinkScript(false); // stops flashing
m_program = -1;
@@ -838,9 +838,9 @@ void CBrain::StopTask() // Introduces a virus into a program.
-// Returns TRUE if it was inserted.
+// Returns true if it was inserted.
-BOOL CBrain::IntroduceVirus()
+bool CBrain::IntroduceVirus()
{
int i, j;
@@ -851,12 +851,12 @@ BOOL CBrain::IntroduceVirus() {
if ( m_script[j]->IntroduceVirus() ) // tries to introduce
{
- m_bActiveVirus = TRUE; // active virus
- return TRUE;
+ m_bActiveVirus = true; // active virus
+ return true;
}
}
}
- return FALSE;
+ return false;
}
// Active Virus indicates that the object is contaminated. Unlike ch'tites (??? - Programerus)
@@ -865,17 +865,17 @@ BOOL CBrain::IntroduceVirus() // (Even if the virus is not fixed).
-void CBrain::SetActiveVirus(BOOL bActive)
+void CBrain::SetActiveVirus(bool bActive)
{
m_bActiveVirus = bActive;
if ( !m_bActiveVirus ) // virus disabled?
{
- m_object->SetVirusMode(FALSE); // chtites (??? - Programerus) letters also
+ m_object->SetVirusMode(false); // chtites (??? - Programerus) letters also
}
}
-BOOL CBrain::RetActiveVirus()
+bool CBrain::RetActiveVirus()
{
return m_bActiveVirus;
}
@@ -885,7 +885,7 @@ BOOL CBrain::RetActiveVirus() void CBrain::StartEditScript(int rank, char* name)
{
- CreateInterface(FALSE); // removes the control buttons
+ CreateInterface(false); // removes the control buttons
if ( m_script[rank] == 0 )
{
@@ -898,16 +898,16 @@ void CBrain::StartEditScript(int rank, char* name) // End of editing a program.
-void CBrain::StopEditScript(BOOL bCancel)
+void CBrain::StopEditScript(bool bCancel)
{
- if ( !bCancel ) SetActiveVirus(FALSE);
+ if ( !bCancel ) SetActiveVirus(false);
if ( !m_studio->StopEditScript(bCancel) ) return;
delete m_studio;
m_studio = 0;
- CreateInterface(TRUE); // puts the control buttons
+ CreateInterface(true); // puts the control buttons
}
@@ -1022,7 +1022,7 @@ Error CBrain::StartTaskTerraform() // Change pencil.
-Error CBrain::StartTaskPen(BOOL bDown, int color)
+Error CBrain::StartTaskPen(bool bDown, int color)
{
Error err;
@@ -1225,7 +1225,7 @@ void CBrain::ColorFlag(int color) // Creates all the interface when the object is selected.
-BOOL CBrain::CreateInterface(BOOL bSelect)
+bool CBrain::CreateInterface(bool bSelect)
{
ObjectType type;
CWindow* pw;
@@ -1246,7 +1246,7 @@ BOOL CBrain::CreateInterface(BOOL bSelect) }
m_defaultEnter = EVENT_NULL;
- if ( !bSelect ) return TRUE;
+ if ( !bSelect ) return true;
pos.x = 0.0f;
pos.y = 0.0f;
@@ -1255,7 +1255,7 @@ BOOL CBrain::CreateInterface(BOOL bSelect) dim.y = 86.0f/480.0f;
m_interface->CreateWindows(pos, dim, 3, EVENT_WINDOW0);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW0);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
m_object->GetTooltipName(name);
pos.x = 0.0f;
@@ -1332,12 +1332,12 @@ BOOL CBrain::CreateInterface(BOOL bSelect) pos.x = ox+sx*6.4f;
pos.y = oy+sy*0;
pb = pw->CreateButton(pos, dim, 29, EVENT_OBJECT_GASDOWN);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
pos.x = ox+sx*6.4f;
pos.y = oy+sy*1;
pb = pw->CreateButton(pos, dim, 28, EVENT_OBJECT_GASUP);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
if ( type != OBJECT_HUMAN ||
m_object->RetOption() != 2 )
@@ -1475,7 +1475,7 @@ BOOL CBrain::CreateInterface(BOOL bSelect) pos.x = ox+sx*5.4f;
pos.y = oy+sy*0.1f;
pw->CreateButton(pos, ddim, 128+56, EVENT_OBJECT_BXXXX);
- DeadInterface(pw, EVENT_OBJECT_BXXXX, FALSE);
+ DeadInterface(pw, EVENT_OBJECT_BXXXX, false);
if ( g_build&BUILD_GFLAT )
{
@@ -1589,7 +1589,7 @@ BOOL CBrain::CreateInterface(BOOL bSelect) pos.x = ox+sx*7.7f;
pos.y = oy+sy*0.5f;
pb = pw->CreateButton(pos, dim, 42, EVENT_OBJECT_FIRE);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
DefaultEnter(pw, EVENT_OBJECT_FIRE);
//? pos.x = ox+sx*10.2f;
@@ -1709,7 +1709,7 @@ BOOL CBrain::CreateInterface(BOOL bSelect) !m_object->RetCameraLock() )
{
//? if ( m_main->RetShowMap() )
- if ( TRUE )
+ if ( true )
{
pos.x = ox+sx*13.4f;
pos.y = oy+sy*1;
@@ -1733,36 +1733,36 @@ BOOL CBrain::CreateInterface(BOOL bSelect) pos.x = ox+sx*10.0f;
pos.y = oy+sy*0.66f;
pb = pw->CreateButton(pos, ddim, 55, EVENT_OBJECT_CAMERAleft);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
pos.x = ox+sx*(10.0f+0.66f*2.0f);
pos.y = oy+sy*0.66f;
pb = pw->CreateButton(pos, ddim, 48, EVENT_OBJECT_CAMERAright);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
pos.x = ox+sx*(10.0f+0.66f);
pos.y = oy+sy*(0.66f*2.0f);
pb = pw->CreateButton(pos, ddim, 49, EVENT_OBJECT_CAMERAnear);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
pos.x = ox+sx*(10.0f+0.66f);
pos.y = oy+sy*0.0f;
pb = pw->CreateButton(pos, ddim, 50, EVENT_OBJECT_CAMERAaway);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
#else
pos.x = ox+sx*9.0f;
pos.y = oy+sy*0;
pb = pw->CreateButton(pos, dim, 55, EVENT_OBJECT_CAMERAleft);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
pos.x = ox+sx*11.0f;
pos.y = oy+sy*0;
pb = pw->CreateButton(pos, dim, 48, EVENT_OBJECT_CAMERAright);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
pos.x = ox+sx*10.0f;
pos.y = oy+sy*1;
pb = pw->CreateButton(pos, dim, 49, EVENT_OBJECT_CAMERAnear);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
pos.x = ox+sx*10.0f;
pos.y = oy+sy*0;
pb = pw->CreateButton(pos, dim, 50, EVENT_OBJECT_CAMERAaway);
- pb->SetImmediat(TRUE);
+ pb->SetImmediat(true);
#endif
}
@@ -1851,7 +1851,7 @@ BOOL CBrain::CreateInterface(BOOL bSelect) }
#if 0
- if ( FALSE )
+ if ( false )
{
pos.x = 505.0f/640.0f;
pos.y = 3.0f/480.0f;
@@ -1919,7 +1919,7 @@ BOOL CBrain::CreateInterface(BOOL bSelect) m_lastUpdateTime = 0.0f;
UpdateInterface(0.0f);
- return TRUE;
+ return true;
}
// Updates the state of all buttons on the interface,
@@ -1940,7 +1940,7 @@ void CBrain::UpdateInterface(float rTime) FPOINT ppos;
float energy, limit, angle, range;
int icon;
- BOOL bOnBoard;
+ bool bOnBoard;
m_lastAlarmTime += rTime;
if ( m_time < m_lastUpdateTime+0.1f ) return;
@@ -2013,7 +2013,7 @@ void CBrain::UpdateInterface(float rTime) }
if ( m_soundChannelAlarm == -1 )
{
- m_soundChannelAlarm = m_sound->Play(SOUND_ALARMt, m_object->RetPosition(0), 0.0f, 0.1f, TRUE);
+ m_soundChannelAlarm = m_sound->Play(SOUND_ALARMt, m_object->RetPosition(0), 0.0f, 0.1f, true);
m_sound->AddEnvelope(m_soundChannelAlarm, 1.0f, 1.0f, 1.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannelAlarm, 1.0f, 1.0f, 1.0f, SOPER_LOOP);
}
@@ -2138,7 +2138,7 @@ void CBrain::UpdateInterface() CColor* pc;
int color;
#endif
- BOOL bEnable, bFly, bRun;
+ bool bEnable, bFly, bRun;
char title[100];
if ( !m_object->RetSelect() ) return;
@@ -2230,10 +2230,10 @@ void CBrain::UpdateInterface() }
else
{
- EnableInterface(pw, EVENT_OBJECT_BEGSHIELD, FALSE);
- EnableInterface(pw, EVENT_OBJECT_ENDSHIELD, FALSE);
- DefaultEnter (pw, EVENT_OBJECT_BEGSHIELD, FALSE);
- DefaultEnter (pw, EVENT_OBJECT_ENDSHIELD, FALSE);
+ EnableInterface(pw, EVENT_OBJECT_BEGSHIELD, false);
+ EnableInterface(pw, EVENT_OBJECT_ENDSHIELD, false);
+ DefaultEnter (pw, EVENT_OBJECT_BEGSHIELD, false);
+ DefaultEnter (pw, EVENT_OBJECT_ENDSHIELD, false);
}
ps = (CSlider*)pw->SearchControl(EVENT_OBJECT_DIMSHIELD);
@@ -2246,14 +2246,14 @@ void CBrain::UpdateInterface() bFly = bEnable;
if ( bFly && (type == OBJECT_HUMAN || type == OBJECT_TECH) )
{
- if ( m_object->RetFret() != 0 ) bFly = FALSE; // if holder -> not fly
+ if ( m_object->RetFret() != 0 ) bFly = false; // if holder -> not fly
}
EnableInterface(pw, EVENT_OBJECT_GASUP, bFly);
EnableInterface(pw, EVENT_OBJECT_GASDOWN, bFly);
if ( m_object->RetTrainer() ) // Training?
{
- DeadInterface(pw, EVENT_OBJECT_GASUP, FALSE);
- DeadInterface(pw, EVENT_OBJECT_GASDOWN, FALSE);
+ DeadInterface(pw, EVENT_OBJECT_GASUP, false);
+ DeadInterface(pw, EVENT_OBJECT_GASDOWN, false);
}
else
{
@@ -2296,17 +2296,17 @@ void CBrain::UpdateInterface() type == OBJECT_BEE ||
type == OBJECT_WORM ) // vehicle?
{
- bRun = FALSE;
+ bRun = false;
if ( m_script[m_selScript] != 0 )
{
m_script[m_selScript]->GetTitle(title);
if ( title[0] != 0 )
{
- bRun = TRUE;
+ bRun = true;
}
}
- if ( !bEnable && m_program == -1 ) bRun = FALSE;
- if ( m_bTraceRecord ) bRun = FALSE;
+ if ( !bEnable && m_program == -1 ) bRun = false;
+ if ( m_bTraceRecord ) bRun = false;
EnableInterface(pw, EVENT_OBJECT_PROGRUN, bRun);
pb = (CButton*)pw->SearchControl(EVENT_OBJECT_PROGRUN);
@@ -2445,7 +2445,7 @@ void CBrain::UpdateScript(CWindow *pw) char name[100];
char title[100];
int i;
- BOOL bSoluce;
+ bool bSoluce;
pl = (CList*)pw->SearchControl(EVENT_OBJECT_PROGLIST);
if ( pl == 0 ) return;
@@ -2453,7 +2453,7 @@ void CBrain::UpdateScript(CWindow *pw) #if _SCHOOL
bSoluce = m_main->RetSoluce4();
#else
- bSoluce = TRUE;
+ bSoluce = true;
#endif
for ( i=0 ; i<BRAINMAXSCRIPT ; i++ )
@@ -2478,11 +2478,11 @@ void CBrain::UpdateScript(CWindow *pw) if ( !bSoluce )
{
- pl->SetEnable(3, FALSE);
+ pl->SetEnable(3, false);
}
pl->SetSelect(m_selScript);
- pl->ShowSelect(TRUE);
+ pl->ShowSelect(true);
}
// Returns the rank of selected script.
@@ -2503,7 +2503,7 @@ int CBrain::RetSelScript() // Blinks the running program.
-void CBrain::BlinkScript(BOOL bEnable)
+void CBrain::BlinkScript(bool bEnable)
{
CWindow* pw;
CList* pl;
@@ -2521,7 +2521,7 @@ void CBrain::BlinkScript(BOOL bEnable) // Check the status of a button interface.
-void CBrain::CheckInterface(CWindow *pw, EventMsg event, BOOL bState)
+void CBrain::CheckInterface(CWindow *pw, EventMsg event, bool bState)
{
CControl* control;
@@ -2533,7 +2533,7 @@ void CBrain::CheckInterface(CWindow *pw, EventMsg event, BOOL bState) // Changes the state of a button interface.
-void CBrain::EnableInterface(CWindow *pw, EventMsg event, BOOL bState)
+void CBrain::EnableInterface(CWindow *pw, EventMsg event, bool bState)
{
CControl* control;
@@ -2545,7 +2545,7 @@ void CBrain::EnableInterface(CWindow *pw, EventMsg event, BOOL bState) // Changes the state of a button on the interface.
-void CBrain::DeadInterface(CWindow *pw, EventMsg event, BOOL bState)
+void CBrain::DeadInterface(CWindow *pw, EventMsg event, bool bState)
{
CControl* control;
@@ -2557,7 +2557,7 @@ void CBrain::DeadInterface(CWindow *pw, EventMsg event, BOOL bState) // Change the default input state of a button interface.
-void CBrain::DefaultEnter(CWindow *pw, EventMsg event, BOOL bState)
+void CBrain::DefaultEnter(CWindow *pw, EventMsg event, bool bState)
{
CControl* control;
@@ -2578,33 +2578,33 @@ void CBrain::DefaultEnter(CWindow *pw, EventMsg event, BOOL bState) // Indicates whether the object is busy with a task.
-BOOL CBrain::IsBusy()
+bool CBrain::IsBusy()
{
return (m_primaryTask != 0);
}
// Management of the activity of an object.
-void CBrain::SetActivity(BOOL bMode)
+void CBrain::SetActivity(bool bMode)
{
m_bActivity = bMode;
}
-BOOL CBrain::RetActivity()
+bool CBrain::RetActivity()
{
return m_bActivity;
}
// Indicates whether a program is running.
-BOOL CBrain::IsProgram()
+bool CBrain::IsProgram()
{
return ( m_program != -1 );
}
// Indicates whether a program exists.
-BOOL CBrain::ProgramExist(int rank)
+bool CBrain::ProgramExist(int rank)
{
return ( m_script[rank] != 0 );
}
@@ -2619,7 +2619,7 @@ void CBrain::RunProgram(int rank) m_script[rank]->Run() )
{
m_program = rank; // start new program
- BlinkScript(TRUE); // blink
+ BlinkScript(true); // blink
m_object->CreateSelectParticule();
m_main->UpdateShortcuts();
}
@@ -2683,14 +2683,14 @@ char* CBrain::RetSoluceName() // Load a script solution, in the first free script.
// If there is already an identical script, nothing is loaded.
-BOOL CBrain::ReadSoluce(char* filename)
+bool CBrain::ReadSoluce(char* filename)
{
int rank, i;
rank = FreeProgram();
- if ( rank == -1 ) return FALSE;
+ if ( rank == -1 ) return false;
- if ( !ReadProgram(rank, filename) ) return FALSE; // load solution
+ if ( !ReadProgram(rank, filename) ) return false; // load solution
for ( i=0 ; i<BRAINMAXSCRIPT ; i++ )
{
@@ -2700,59 +2700,59 @@ BOOL CBrain::ReadSoluce(char* filename) {
delete m_script[rank];
m_script[rank] = 0;
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
// Load a script with a text file.
-BOOL CBrain::ReadProgram(int rank, char* filename)
+bool CBrain::ReadProgram(int rank, char* filename)
{
if ( m_script[rank] == 0 )
{
m_script[rank] = new CScript(m_iMan, m_object, &m_secondaryTask);
}
- if ( m_script[rank]->ReadScript(filename) ) return TRUE;
+ if ( m_script[rank]->ReadScript(filename) ) return true;
delete m_script[rank];
m_script[rank] = 0;
- return FALSE;
+ return false;
}
// Indicates whether a program is compiled correctly.
-BOOL CBrain::RetCompile(int rank)
+bool CBrain::RetCompile(int rank)
{
- if ( m_script[rank] == 0 ) return FALSE;
+ if ( m_script[rank] == 0 ) return false;
return m_script[rank]->RetCompile();
}
// Saves a script in a text file.
-BOOL CBrain::WriteProgram(int rank, char* filename)
+bool CBrain::WriteProgram(int rank, char* filename)
{
if ( m_script[rank] == 0 )
{
m_script[rank] = new CScript(m_iMan, m_object, &m_secondaryTask);
}
- if ( m_script[rank]->WriteScript(filename) ) return TRUE;
+ if ( m_script[rank]->WriteScript(filename) ) return true;
delete m_script[rank];
m_script[rank] = 0;
- return FALSE;
+ return false;
}
// Load a stack of script implementation from a file.
-BOOL CBrain::ReadStack(FILE *file)
+bool CBrain::ReadStack(FILE *file)
{
short op;
@@ -2764,22 +2764,22 @@ BOOL CBrain::ReadStack(FILE *file) {
m_program = op; // program restarts
m_selScript = op;
- BlinkScript(TRUE); // blink
+ BlinkScript(true); // blink
if ( m_script[op] == 0 )
{
m_script[op] = new CScript(m_iMan, m_object, &m_secondaryTask);
}
- if ( !m_script[op]->ReadStack(file) ) return FALSE;
+ if ( !m_script[op]->ReadStack(file) ) return false;
}
}
- return TRUE;
+ return true;
}
// ave the script implementation stack of a file.
-BOOL CBrain::WriteStack(FILE *file)
+bool CBrain::WriteStack(FILE *file)
{
short op;
@@ -2797,7 +2797,7 @@ BOOL CBrain::WriteStack(FILE *file) op = 0; // stop
fWrite(&op, sizeof(short), 1, file);
- return TRUE;
+ return true;
}
@@ -2938,23 +2938,23 @@ void CBrain::TraceRecordStop() // Saves an instruction CBOT.
-BOOL CBrain::TraceRecordOper(TraceOper oper, float param)
+bool CBrain::TraceRecordOper(TraceOper oper, float param)
{
int i;
i = m_traceRecordIndex;
- if ( i >= MAXTRACERECORD ) return FALSE;
+ if ( i >= MAXTRACERECORD ) return false;
m_traceRecordBuffer[i].oper = oper;
m_traceRecordBuffer[i].param = param;
m_traceRecordIndex = i+1;
- return TRUE;
+ return true;
}
// Generates an instruction CBOT.
-BOOL CBrain::TraceRecordPut(char *buffer, int max, TraceOper oper, float param)
+bool CBrain::TraceRecordPut(char *buffer, int max, TraceOper oper, float param)
{
char line[100];
int color;
@@ -2995,6 +2995,6 @@ BOOL CBrain::TraceRecordPut(char *buffer, int max, TraceOper oper, float param) if ( color == 10 ) strncat(buffer, "\tpendown(Brown);\n", max-1);
}
- return TRUE;
+ return true;
}
diff --git a/src/object/brain.h b/src/object/brain.h index 348f059..11fd379 100644 --- a/src/object/brain.h +++ b/src/object/brain.h @@ -74,31 +74,31 @@ public: CBrain(CInstanceManager* iMan, CObject* object);
~CBrain();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void SetPhysics(CPhysics* physics);
void SetMotion(CMotion* motion);
- BOOL EventProcess(const Event &event);
- BOOL CreateInterface(BOOL bSelect);
+ bool EventProcess(const Event &event);
+ bool CreateInterface(bool bSelect);
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
- BOOL IsBusy();
- void SetActivity(BOOL bMode);
- BOOL RetActivity();
- BOOL IsProgram();
- BOOL ProgramExist(int rank);
+ bool IsBusy();
+ void SetActivity(bool bMode);
+ bool RetActivity();
+ bool IsProgram();
+ bool ProgramExist(int rank);
void RunProgram(int rank);
int FreeProgram();
int RetProgram();
void StopProgram();
void StopTask();
- BOOL IntroduceVirus();
- void SetActiveVirus(BOOL bActive);
- BOOL RetActiveVirus();
+ bool IntroduceVirus();
+ void SetActiveVirus(bool bActive);
+ bool RetActiveVirus();
void SetScriptRun(int rank);
int RetScriptRun();
@@ -107,12 +107,12 @@ public: void SetSoluceName(char *name);
char* RetSoluceName();
- BOOL ReadSoluce(char* filename);
- BOOL ReadProgram(int rank, char* filename);
- BOOL RetCompile(int rank);
- BOOL WriteProgram(int rank, char* filename);
- BOOL ReadStack(FILE *file);
- BOOL WriteStack(FILE *file);
+ bool ReadSoluce(char* filename);
+ bool ReadProgram(int rank, char* filename);
+ bool RetCompile(int rank);
+ bool WriteProgram(int rank, char* filename);
+ bool ReadStack(FILE *file);
+ bool WriteStack(FILE *file);
Error StartTaskTake();
Error StartTaskManip(TaskManipOrder order, TaskManipArm arm);
@@ -120,7 +120,7 @@ public: Error StartTaskBuild(ObjectType type);
Error StartTaskSearch();
Error StartTaskTerraform();
- Error StartTaskPen(BOOL bDown, int color);
+ Error StartTaskPen(bool bDown, int color);
Error StartTaskRecover();
Error StartTaskShield(TaskShieldMode mode);
Error StartTaskFire(float delay);
@@ -132,10 +132,10 @@ public: void UpdateInterface();
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
void StartEditScript(int rank, char* name);
- void StopEditScript(BOOL bCancel);
+ void StopEditScript(bool bCancel);
Error EndedTask();
@@ -144,18 +144,18 @@ protected: void UpdateScript(CWindow *pw);
int RetSelScript();
- void BlinkScript(BOOL bEnable);
+ void BlinkScript(bool bEnable);
- void CheckInterface(CWindow *pw, EventMsg event, BOOL bState);
- void EnableInterface(CWindow *pw, EventMsg event, BOOL bState);
- void DeadInterface(CWindow *pw, EventMsg event, BOOL bState);
- void DefaultEnter(CWindow *pw, EventMsg event, BOOL bState=TRUE);
+ void CheckInterface(CWindow *pw, EventMsg event, bool bState);
+ void EnableInterface(CWindow *pw, EventMsg event, bool bState);
+ void DeadInterface(CWindow *pw, EventMsg event, bool bState);
+ void DefaultEnter(CWindow *pw, EventMsg event, bool bState=true);
void TraceRecordStart();
void TraceRecordFrame();
void TraceRecordStop();
- BOOL TraceRecordOper(TraceOper oper, float param);
- BOOL TraceRecordPut(char *buffer, int max, TraceOper oper, float param);
+ bool TraceRecordOper(TraceOper oper, float param);
+ bool TraceRecordPut(char *buffer, int max, TraceOper oper, float param);
protected:
CInstanceManager* m_iMan;
@@ -178,9 +178,9 @@ protected: CScript* m_script[BRAINMAXSCRIPT];
int m_selScript; // rank of the selected script
int m_program; // rank of the executed program / ​​-1
- BOOL m_bActivity;
- BOOL m_bBurn;
- BOOL m_bActiveVirus;
+ bool m_bActivity;
+ bool m_bBurn;
+ bool m_bActiveVirus;
int m_scriptRun;
char m_scriptName[BRAINMAXSCRIPT][50];
@@ -206,7 +206,7 @@ protected: int m_soundChannelAlarm;
int m_flagColor;
- BOOL m_bTraceRecord;
+ bool m_bTraceRecord;
TraceOper m_traceOper;
D3DVECTOR m_tracePos;
float m_traceAngle;
diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp index 27e5f9c..52609a9 100644 --- a/src/object/motion/motion.cpp +++ b/src/object/motion/motion.cpp @@ -84,7 +84,7 @@ CMotion::~CMotion() // Deletes the object.
-void CMotion::DeleteObject(BOOL bAll)
+void CMotion::DeleteObject(bool bAll)
{
}
@@ -102,22 +102,22 @@ void CMotion::SetBrain(CBrain* brain) // Creates.
-BOOL CMotion::Create(D3DVECTOR pos, float angle, ObjectType type, float power)
+bool CMotion::Create(D3DVECTOR pos, float angle, ObjectType type, float power)
{
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotion::EventProcess(const Event &event)
+bool CMotion::EventProcess(const Event &event)
{
D3DVECTOR pos, dir;
float time;
if ( m_object->RetType() != OBJECT_TOTO &&
- m_engine->RetPause() ) return TRUE;
+ m_engine->RetPause() ) return true;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_actionTime;
if ( m_progress > 1.0f ) m_progress = 1.0f; // (*)
@@ -150,7 +150,7 @@ BOOL CMotion::EventProcess(const Event &event) dir.z = Smooth(dir.z, m_inclinaison.z, time);
m_object->SetInclinaison(dir);
- return TRUE;
+ return true;
}
// (*) Avoids the bug of ants returned by the thumper and
@@ -177,9 +177,9 @@ int CMotion::RetAction() // Specifies a special parameter.
-BOOL CMotion::SetParam(int rank, float value)
+bool CMotion::SetParam(int rank, float value)
{
- return FALSE;
+ return false;
}
float CMotion::RetParam(int rank)
@@ -190,11 +190,11 @@ float CMotion::RetParam(int rank) // Saves all parameters of the object.
-BOOL CMotion::Write(char *line)
+bool CMotion::Write(char *line)
{
char name[100];
- if ( m_actionType == -1 ) return FALSE;
+ if ( m_actionType == -1 ) return false;
sprintf(name, " mType=%d", m_actionType);
strcat(line, name);
@@ -205,18 +205,18 @@ BOOL CMotion::Write(char *line) sprintf(name, " mProgress=%.2f", m_progress);
strcat(line, name);
- return FALSE;
+ return false;
}
// Restores all parameters of the object.
-BOOL CMotion::Read(char *line)
+bool CMotion::Read(char *line)
{
m_actionType = OpInt(line, "mType", -1);
m_actionTime = OpFloat(line, "mTime", 0.0f);
m_progress = OpFloat(line, "mProgress", 0.0f);
- return FALSE;
+ return false;
}
diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h index ce7b522..555fbe4 100644 --- a/src/object/motion/motion.h +++ b/src/object/motion/motion.h @@ -45,17 +45,17 @@ public: void SetPhysics(CPhysics* physics);
void SetBrain(CBrain* brain);
- virtual void DeleteObject(BOOL bAll=FALSE);
- virtual BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- virtual BOOL EventProcess(const Event &event);
+ virtual void DeleteObject(bool bAll=false);
+ virtual bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ virtual bool EventProcess(const Event &event);
virtual Error SetAction(int action, float time=0.2f);
virtual int RetAction();
- virtual BOOL SetParam(int rank, float value);
+ virtual bool SetParam(int rank, float value);
virtual float RetParam(int rank);
- virtual BOOL Write(char *line);
- virtual BOOL Read(char *line);
+ virtual bool Write(char *line);
+ virtual bool Read(char *line);
virtual void SetLinVibration(D3DVECTOR dir);
virtual D3DVECTOR RetLinVibration();
diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp index ca7505b..0f6543a 100644 --- a/src/object/motion/motionant.cpp +++ b/src/object/motion/motionant.cpp @@ -43,7 +43,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define START_TIME 1000.0f // beginning of the relative time
@@ -61,7 +61,7 @@ CMotionAnt::CMotionAnt(CInstanceManager* iMan, CObject* object) m_armPartIndex = 0;
m_armMemberIndex = 0;
m_armLastAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
m_lastParticule = 0.0f;
}
@@ -74,20 +74,20 @@ CMotionAnt::~CMotionAnt() // Removes an object.
-void CMotionAnt::DeleteObject(BOOL bAll)
+void CMotionAnt::DeleteObject(bool bAll)
{
}
// Creates a vehicle poses some rolling on the floor.
-BOOL CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 3+18 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 3+18 ) return false;
pModFile = new CModFile(m_iMan);
@@ -309,7 +309,7 @@ BOOL CMotionAnt::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -430,7 +430,7 @@ void CMotionAnt::CreatePhysics() // Management of an event.
-BOOL CMotionAnt::EventProcess(const Event &event)
+bool CMotionAnt::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -469,7 +469,7 @@ BOOL CMotionAnt::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Calculates a value (radians) proportional between a and b (degrees).
@@ -486,17 +486,17 @@ inline float Propf(float a, float b, float p) // Management of an event.
-BOOL CMotionAnt::EventFrame(const Event &event)
+bool CMotionAnt::EventFrame(const Event &event)
{
D3DVECTOR dir, pos, speed;
FPOINT dim;
float s, a, prog, time;
float tSt[9], tNd[9];
int i, ii, st, nd, action;
- BOOL bStop;
+ bool bStop;
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)*1.5f;
a = Abs(m_physics->RetCirMotionY(MO_MOTSPEED)*2.0f);
@@ -833,7 +833,7 @@ BOOL CMotionAnt::EventFrame(const Event &event) if ( m_progress >= 1.0f )
{
SetAction(-1);
- m_object->SetFixed(FALSE); // moving again
+ m_object->SetFixed(false); // moving again
}
}
else
@@ -893,7 +893,7 @@ BOOL CMotionAnt::EventFrame(const Event &event) m_object->SetAngleY(1, sinf(m_armTimeAbs*2.1f)*0.50f); // head
}
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionant.h b/src/object/motion/motionant.h index 4d5781a..084a9a9 100644 --- a/src/object/motion/motionant.h +++ b/src/object/motion/motionant.h @@ -53,13 +53,13 @@ public: CMotionAnt(CInstanceManager* iMan, CObject* object);
~CMotionAnt();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_armMember;
@@ -71,7 +71,7 @@ protected: int m_armPartIndex;
int m_armMemberIndex;
int m_armLastAction;
- BOOL m_bArmStop;
+ bool m_bArmStop;
float m_lastParticule;
};
diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp index 21a465a..7f3da7a 100644 --- a/src/object/motion/motionbee.cpp +++ b/src/object/motion/motionbee.cpp @@ -43,7 +43,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define START_TIME 1000.0f // beginning of the relative time
@@ -61,7 +61,7 @@ CMotionBee::CMotionBee(CInstanceManager* iMan, CObject* object) m_armPartIndex = 0;
m_armMemberIndex = 0;
m_armLastAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
}
// Object's destructor.
@@ -73,20 +73,20 @@ CMotionBee::~CMotionBee() // Removes an object.
-void CMotionBee::DeleteObject(BOOL bAll)
+void CMotionBee::DeleteObject(bool bAll)
{
}
// Creates a vehicle traveling any lands on the ground.
-BOOL CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 3+18+2 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 3+18+2 ) return false;
pModFile = new CModFile(m_iMan);
@@ -321,7 +321,7 @@ BOOL CMotionBee::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physical object.
@@ -407,7 +407,7 @@ void CMotionBee::CreatePhysics() // Management of an event.
-BOOL CMotionBee::EventProcess(const Event &event)
+bool CMotionBee::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -446,20 +446,20 @@ BOOL CMotionBee::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionBee::EventFrame(const Event &event)
+bool CMotionBee::EventFrame(const Event &event)
{
D3DVECTOR dir;
float s, a, prog;
int action, i, st, nd;
- BOOL bStop;
+ bool bStop;
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)*0.30f;
a = Abs(m_physics->RetCirMotionY(MO_MOTSPEED)*2.00f);
@@ -471,7 +471,7 @@ BOOL CMotionBee::EventFrame(const Event &event) m_armMember += (s+a)*event.rTime*0.15f;
bStop = ( a == 0.0f && s == 0.0f ); // stopped?
- if ( !m_physics->RetLand() ) bStop = TRUE;
+ if ( !m_physics->RetLand() ) bStop = true;
if ( bStop )
{
@@ -655,7 +655,7 @@ BOOL CMotionBee::EventFrame(const Event &event) m_engine->SetObjectShadowColor(m_objectPart[0].object, color);
#endif
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionbee.h b/src/object/motion/motionbee.h index e73e2d3..a62f2ba 100644 --- a/src/object/motion/motionbee.h +++ b/src/object/motion/motionbee.h @@ -47,13 +47,13 @@ public: CMotionBee(CInstanceManager* iMan, CObject* object);
~CMotionBee();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_armMember;
@@ -65,6 +65,6 @@ protected: int m_armPartIndex;
int m_armMemberIndex;
int m_armLastAction;
- BOOL m_bArmStop;
+ bool m_bArmStop;
};
diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index c164570..02e4dd3 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -45,7 +45,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define ADJUST_ACTION (3*3*3*3*MH_SPEC+3*3*3*MHS_SATCOM)
#define START_TIME 1000.0f // beginning of the relative time
@@ -66,12 +66,12 @@ CMotionHuman::CMotionHuman(CInstanceManager* iMan, CObject* object) m_armPartIndex = 0;
m_armMemberIndex = 0;
m_armLastAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
m_lastSoundMarch = 0.0f;
m_lastSoundHhh = 0.0f;
m_time = 0.0f;
m_tired = 0.0f;
- m_bDisplayPerso = FALSE;
+ m_bDisplayPerso = false;
}
// Object's constructor.
@@ -83,7 +83,7 @@ CMotionHuman::~CMotionHuman() // Removes an object.
-void CMotionHuman::DeleteObject(BOOL bAll)
+void CMotionHuman::DeleteObject(bool bAll)
{
if ( m_partiReactor != -1 )
{
@@ -105,14 +105,14 @@ Error CMotionHuman::SetAction(int action, float time) // Creates cosmonaut on the ground.
-BOOL CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
char filename[100];
int rank, option, face, glasses;
- if ( m_engine->RetRestCreate() < 16 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 16 ) return false;
pModFile = new CModFile(m_iMan);
@@ -147,7 +147,7 @@ BOOL CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the main base.
@@ -371,7 +371,7 @@ BOOL CMotionHuman::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physical object.
@@ -664,7 +664,7 @@ void CMotionHuman::CreatePhysics(ObjectType type) // Management of an event.
-BOOL CMotionHuman::EventProcess(const Event &event)
+bool CMotionHuman::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -710,7 +710,7 @@ BOOL CMotionHuman::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Calculates a value (radians) proportional between a and b (degrees).
@@ -727,7 +727,7 @@ inline float Propf(float a, float b, float p) // Management of an event.
-BOOL CMotionHuman::EventFrame(const Event &event)
+bool CMotionHuman::EventFrame(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR dir, actual, pos, speed, pf;
@@ -737,7 +737,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) float tSt[9], tNd[9];
float aa, bb, shield, deadFactor, level;
int i, ii, st, nd, action, legAction, armAction;
- BOOL bOnBoard, bSwim, bStop;
+ bool bOnBoard, bSwim, bStop;
if ( m_engine->RetPause() )
{
@@ -747,15 +747,15 @@ BOOL CMotionHuman::EventFrame(const Event &event) }
else
{
- return TRUE;
+ return true;
}
}
- bOnBoard = FALSE;
+ bOnBoard = false;
if ( m_object->RetSelect() &&
m_camera->RetType() == CAMERA_ONBOARD )
{
- bOnBoard = TRUE;
+ bOnBoard = true;
}
if ( m_bDisplayPerso && m_main->RetGamerOnlyHead() )
@@ -763,7 +763,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) m_time += event.rTime;
m_object->SetLinVibration(D3DVECTOR(0.0f, -0.55f, 0.0f));
m_object->SetCirVibration(D3DVECTOR(0.0f, m_main->RetPersoAngle(), 0.0f));
- return TRUE;
+ return true;
}
if ( m_bDisplayPerso )
{
@@ -1439,7 +1439,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) {
if ( m_progress >= 1.0f )
{
- m_object->SetEnable(FALSE);
+ m_object->SetEnable(false);
}
time = 100.0f;
@@ -1483,7 +1483,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) if ( prog >= 1.0f )
{
prog = 1.0f;
- if ( pos.y >= level ) m_object->SetEnable(FALSE);
+ if ( pos.y >= level ) m_object->SetEnable(false);
}
prog *= 2.0f;
@@ -1778,7 +1778,7 @@ BOOL CMotionHuman::EventFrame(const Event &event) m_lastSoundHhh = (4.0f-m_tired*2.5f)+(4.0f-m_tired*2.5f)*Rand();
}
- return TRUE;
+ return true;
}
@@ -1786,12 +1786,12 @@ BOOL CMotionHuman::EventFrame(const Event &event) void CMotionHuman::StartDisplayPerso()
{
- m_bDisplayPerso = TRUE;
+ m_bDisplayPerso = true;
}
void CMotionHuman::StopDisplayPerso()
{
- m_bDisplayPerso = FALSE;
+ m_bDisplayPerso = false;
}
diff --git a/src/object/motion/motionhuman.h b/src/object/motion/motionhuman.h index 2cb685a..e563a81 100644 --- a/src/object/motion/motionhuman.h +++ b/src/object/motion/motionhuman.h @@ -66,9 +66,9 @@ public: CMotionHuman(CInstanceManager* iMan, CObject* object);
~CMotionHuman();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
Error SetAction(int action, float time=0.2f);
void StartDisplayPerso();
@@ -76,7 +76,7 @@ public: protected:
void CreatePhysics(ObjectType type);
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
int m_partiReactor;
@@ -89,11 +89,11 @@ protected: int m_armPartIndex;
int m_armMemberIndex;
int m_armLastAction;
- BOOL m_bArmStop;
+ bool m_bArmStop;
float m_lastSoundMarch;
float m_lastSoundHhh;
float m_time;
float m_tired;
- BOOL m_bDisplayPerso;
+ bool m_bDisplayPerso;
};
diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp index 8e0073b..6db0a8b 100644 --- a/src/object/motion/motionmother.cpp +++ b/src/object/motion/motionmother.cpp @@ -43,7 +43,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define START_TIME 1000.0f // beginning of the relative time
@@ -62,7 +62,7 @@ CMotionMother::CMotionMother(CInstanceManager* iMan, CObject* object) m_armMemberIndex = 0;
m_armLastAction = -1;
m_specAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
}
// Object's destructor.
@@ -74,20 +74,20 @@ CMotionMother::~CMotionMother() // Removes an object.
-void CMotionMother::DeleteObject(BOOL bAll)
+void CMotionMother::DeleteObject(bool bAll)
{
}
// Creates a vehicle traveling any lands on the ground.
-BOOL CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 2+12+6 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 2+12+6 ) return false;
pModFile = new CModFile(m_iMan);
@@ -295,7 +295,7 @@ BOOL CMotionMother::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -356,7 +356,7 @@ void CMotionMother::CreatePhysics() // Management of an event.
-BOOL CMotionMother::EventProcess(const Event &event)
+bool CMotionMother::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -395,20 +395,20 @@ BOOL CMotionMother::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionMother::EventFrame(const Event &event)
+bool CMotionMother::EventFrame(const Event &event)
{
D3DVECTOR dir;
float s, a, prog;
int i, st, nd;
- BOOL bStop;
+ bool bStop;
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)*1.5f;
a = Abs(m_physics->RetCirMotionY(MO_MOTSPEED)*26.0f);
@@ -535,7 +535,7 @@ BOOL CMotionMother::EventFrame(const Event &event) m_object->SetAngleY(19, sinf(m_armTimeAbs*0.9f)*0.20f); // left claw
m_object->SetAngleZ(19, -0.20f);
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionmother.h b/src/object/motion/motionmother.h index 3c5cb94..d3a6b2a 100644 --- a/src/object/motion/motionmother.h +++ b/src/object/motion/motionmother.h @@ -39,13 +39,13 @@ public: CMotionMother(CInstanceManager* iMan, CObject* object);
~CMotionMother();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_armMember;
@@ -59,6 +59,6 @@ protected: int m_armLastAction;
int m_specAction;
float m_specTime;
- BOOL m_bArmStop;
+ bool m_bArmStop;
};
diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp index 7b51290..2671933 100644 --- a/src/object/motion/motionspider.cpp +++ b/src/object/motion/motionspider.cpp @@ -43,7 +43,7 @@ -#define ADJUST_ANGLE FALSE // TRUE -> adjusts the angles of the members
+#define ADJUST_ANGLE false // true -> adjusts the angles of the members
#define START_TIME 1000.0f // beginning of the relative time
@@ -61,7 +61,7 @@ CMotionSpider::CMotionSpider(CInstanceManager* iMan, CObject* object) m_armPartIndex = 0;
m_armMemberIndex = 0;
m_armLastAction = -1;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
m_lastParticule = 0.0f;
}
@@ -74,14 +74,14 @@ CMotionSpider::~CMotionSpider() // Removes an object.
-void CMotionSpider::DeleteObject(BOOL bAll)
+void CMotionSpider::DeleteObject(bool bAll)
{
}
// Creates a vehicle traveling any lands on the ground.
-BOOL CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
@@ -112,7 +112,7 @@ BOOL CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type, 0.0f, 0.0f, -2.0f,
};
- if ( m_engine->RetRestCreate() < 3+32+2 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 3+32+2 ) return false;
pModFile = new CModFile(m_iMan);
@@ -218,7 +218,7 @@ BOOL CMotionSpider::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -343,7 +343,7 @@ void CMotionSpider::CreatePhysics() // Management of an event.
-BOOL CMotionSpider::EventProcess(const Event &event)
+bool CMotionSpider::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -383,7 +383,7 @@ BOOL CMotionSpider::EventProcess(const Event &event) #endif
}
- return TRUE;
+ return true;
}
// Calculates a value (radians) proportional between a and b (degrees).
@@ -400,17 +400,17 @@ inline float Propf(float a, float b, float p) // Management of an event.
-BOOL CMotionSpider::EventFrame(const Event &event)
+bool CMotionSpider::EventFrame(const Event &event)
{
D3DVECTOR dir, pos, speed;
FPOINT dim;
float s, a, prog, time;
float tSt[12], tNd[12];
int i, ii, st, nd, action;
- BOOL bStop;
+ bool bStop;
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)*1.5f;
a = Abs(m_physics->RetCirMotionY(MO_MOTSPEED)*2.0f);
@@ -738,7 +738,7 @@ BOOL CMotionSpider::EventFrame(const Event &event) if ( m_progress >= 1.0f )
{
SetAction(-1);
- m_object->SetFixed(FALSE); // moving again
+ m_object->SetFixed(false); // moving again
}
}
else
@@ -781,7 +781,7 @@ BOOL CMotionSpider::EventFrame(const Event &event) m_object->SetAngleY(36, -sinf(m_armTimeAbs*3.1f)*0.20f); // mandible
}
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionspider.h b/src/object/motion/motionspider.h index f642afe..bda769d 100644 --- a/src/object/motion/motionspider.h +++ b/src/object/motion/motionspider.h @@ -51,13 +51,13 @@ public: CMotionSpider(CInstanceManager* iMan, CObject* object);
~CMotionSpider();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_armMember;
@@ -69,7 +69,7 @@ protected: int m_armPartIndex;
int m_armMemberIndex;
int m_armLastAction;
- BOOL m_bArmStop;
+ bool m_bArmStop;
float m_lastParticule;
};
diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index 7ba4192..64ff021 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -54,9 +54,9 @@ CMotionToto::CMotionToto(CInstanceManager* iMan, CObject* object) : CMotion(iMan, object)
{
m_time = 0.0f;
- m_bDisplayInfo = FALSE;
- m_bQuickPos = FALSE;
- m_bStartAction = FALSE;
+ m_bDisplayInfo = false;
+ m_bQuickPos = false;
+ m_bStartAction = false;
m_speedAction = 20.0f;
m_soundChannel = -1;
m_clownRadius = 0.0f;
@@ -78,7 +78,7 @@ CMotionToto::~CMotionToto() // Removes an object.
-void CMotionToto::DeleteObject(BOOL bAll)
+void CMotionToto::DeleteObject(bool bAll)
{
if ( m_soundChannel != -1 )
{
@@ -90,13 +90,13 @@ void CMotionToto::DeleteObject(BOOL bAll) // Creates a vehicle traveling any lands on the ground.
-BOOL CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 10 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 10 ) return false;
pModFile = new CModFile(m_iMan);
@@ -206,7 +206,7 @@ BOOL CMotionToto::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
@@ -216,7 +216,7 @@ void CMotionToto::StartDisplayInfo() {
return;
//?
- m_bDisplayInfo = TRUE;
+ m_bDisplayInfo = true;
m_actionType = -1;
m_actionTime = 0.0f;
@@ -230,8 +230,8 @@ return; void CMotionToto::StopDisplayInfo()
{
- m_bDisplayInfo = FALSE;
- m_bQuickPos = TRUE;
+ m_bDisplayInfo = false;
+ m_bQuickPos = true;
}
// Gives the position of the mouse.
@@ -244,7 +244,7 @@ void CMotionToto::SetMousePos(FPOINT pos) // Management of an event.
-BOOL CMotionToto::EventProcess(const Event &event)
+bool CMotionToto::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -253,12 +253,12 @@ BOOL CMotionToto::EventProcess(const Event &event) return EventFrame(event);
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionToto::EventFrame(const Event &event)
+bool CMotionToto::EventFrame(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR eye, lookat, dir, perp, nPos, aPos, pos, speed;
@@ -269,28 +269,28 @@ BOOL CMotionToto::EventFrame(const Event &event) float progress, focus, distance, shift, verti, level, zoom;
float aAngle, nAngle, mAngle, angle, linSpeed, cirSpeed;
int sheet, i, r;
- BOOL bHidden;
+ bool bHidden;
if ( m_engine->RetPause() &&
- !m_main->RetInfoLock() ) return TRUE;
+ !m_main->RetInfoLock() ) return true;
if ( m_bDisplayInfo ) // "looks" mouse?
{
- bHidden = FALSE;
+ bHidden = false;
}
else
{
- bHidden = FALSE;
+ bHidden = false;
if ( m_main->RetMovieLock() ) // current movie?
{
- bHidden = TRUE;
+ bHidden = true;
}
if ( !m_engine->RetTotoMode() )
{
if ( !m_main->RetEditLock() ) // current edition?
{
- bHidden = TRUE;
+ bHidden = true;
}
}
}
@@ -298,10 +298,10 @@ BOOL CMotionToto::EventFrame(const Event &event) if ( bHidden )
{
nPos = m_object->RetPosition(0);
- m_terrain->MoveOnFloor(nPos, TRUE);
+ m_terrain->MoveOnFloor(nPos, true);
nPos.y -= 100.0f; // hidden under the ground!
m_object->SetPosition(0, nPos);
- return TRUE;
+ return true;
}
m_time += event.rTime;
@@ -442,7 +442,7 @@ BOOL CMotionToto::EventFrame(const Event &event) if ( m_bQuickPos ) // immediately in place?
{
- m_bQuickPos = FALSE;
+ m_bQuickPos = false;
linSpeed = 0.0f;
}
else
@@ -456,7 +456,7 @@ BOOL CMotionToto::EventFrame(const Event &event) {
if ( m_bStartAction )
{
- m_bStartAction = FALSE;
+ m_bStartAction = false;
m_speedAction = Length(nPos, aPos)/15.0f;
if ( m_speedAction < 20.0f ) m_speedAction = 20.0f;
}
@@ -809,7 +809,7 @@ BOOL CMotionToto::EventFrame(const Event &event) }
//? if ( m_bDisplayInfo && m_main->RetGlint() )
- if ( FALSE )
+ if ( false )
{
pos.x = (Rand()-0.5f)*1.4f;
pos.y = (Rand()-0.5f)*1.4f+3.5f;
@@ -846,7 +846,7 @@ BOOL CMotionToto::EventFrame(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -858,7 +858,7 @@ Error CMotionToto::SetAction(int action, float time) CMotion::SetAction(action, time);
- m_bStartAction = TRUE;
+ m_bStartAction = true;
sound = SOUND_CLICK;
if ( action == MT_ERROR ) sound = SOUND_ERROR;
diff --git a/src/object/motion/motiontoto.h b/src/object/motion/motiontoto.h index 3549638..1c7f871 100644 --- a/src/object/motion/motiontoto.h +++ b/src/object/motion/motiontoto.h @@ -46,9 +46,9 @@ public: CMotionToto(CInstanceManager* iMan, CObject* object);
~CMotionToto();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
Error SetAction(int action, float time=0.2f);
void SetLinkType(ObjectType type);
@@ -57,14 +57,14 @@ public: void SetMousePos(FPOINT pos);
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_time;
float m_lastMotorParticule;
- BOOL m_bDisplayInfo;
- BOOL m_bQuickPos;
- BOOL m_bStartAction;
+ bool m_bDisplayInfo;
+ bool m_bQuickPos;
+ bool m_bStartAction;
float m_speedAction;
float m_clownRadius;
float m_clownDelay;
diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 61b4db5..56eab8d 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -74,9 +74,9 @@ CMotionVehicle::CMotionVehicle(CInstanceManager* iMan, CObject* object) m_wheelLastPos = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_wheelLastAngle = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_posKey = D3DVECTOR(0.0f, 0.0f, 0.0f);
- m_bFlyFix = FALSE;
+ m_bFlyFix = false;
- m_bTraceDown = FALSE;
+ m_bTraceDown = false;
m_traceColor = 1; // black
m_traceWidth = 0.5f;
}
@@ -90,7 +90,7 @@ CMotionVehicle::~CMotionVehicle() // Removes an object.
-void CMotionVehicle::DeleteObject(BOOL bAll)
+void CMotionVehicle::DeleteObject(bool bAll)
{
if ( m_partiReactor != -1 )
{
@@ -102,7 +102,7 @@ void CMotionVehicle::DeleteObject(BOOL bAll) // Creates a vehicle traveling any lands on the ground.
-BOOL CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
@@ -111,7 +111,7 @@ BOOL CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type, D3DCOLORVALUE color;
char name[50];
- if ( m_engine->RetRestCreate() < 1+5+18+1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1+5+18+1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -1075,7 +1075,7 @@ BOOL CMotionVehicle::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -1364,7 +1364,7 @@ void CMotionVehicle::CreatePhysics(ObjectType type) // Management of an event.
-BOOL CMotionVehicle::EventProcess(const Event &event)
+bool CMotionVehicle::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -1377,12 +1377,12 @@ BOOL CMotionVehicle::EventProcess(const Event &event) {
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionVehicle::EventFrame(const Event &event)
+bool CMotionVehicle::EventFrame(const Event &event)
{
D3DMATRIX* mat;
Character* character;
@@ -1391,8 +1391,8 @@ BOOL CMotionVehicle::EventFrame(const Event &event) float s, a, speedBL, speedBR, speedFL, speedFR, h, a1, a2;
float back, front, dist, radius, limit[2];
- if ( m_engine->RetPause() ) return TRUE;
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
type = m_object->RetType();
@@ -1705,12 +1705,12 @@ BOOL CMotionVehicle::EventFrame(const Event &event) EventFrameCanoni(event);
}
- return TRUE;
+ return true;
}
// Managing an event for a flying robot.
-BOOL CMotionVehicle::EventFrameFly(const Event &event)
+bool CMotionVehicle::EventFrameFly(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR pos, angle, paw[3];
@@ -1725,7 +1725,7 @@ BOOL CMotionVehicle::EventFrameFly(const Event &event) pos.z == m_wheelLastPos.z &&
angle.x == m_wheelLastAngle.x &&
angle.y == m_wheelLastAngle.y &&
- angle.z == m_wheelLastAngle.z ) return TRUE;
+ angle.z == m_wheelLastAngle.z ) return true;
m_wheelLastPos = pos;
m_wheelLastAngle = angle;
@@ -1753,29 +1753,29 @@ BOOL CMotionVehicle::EventFrameFly(const Event &event) hope[2] = 0.0f; // left back
}
- m_bFlyFix = TRUE;
+ m_bFlyFix = true;
for ( i=0 ; i<3 ; i++ )
{
actual = m_object->RetAngleZ(6+i);
final = Smooth(actual, hope[i], event.rTime*5.0f);
if ( final != actual )
{
- m_bFlyFix = FALSE; // it is moving
+ m_bFlyFix = false; // it is moving
m_object->SetAngleZ(6+i, final);
}
}
- return TRUE;
+ return true;
}
// Event management for insect legs.
-BOOL CMotionVehicle::EventFrameInsect(const Event &event)
+bool CMotionVehicle::EventFrameInsect(const Event &event)
{
D3DVECTOR dir;
float s, a, prog, time;
int i, st, nd, action;
- BOOL bStop, bOnBoard;
+ bool bStop, bOnBoard;
static int table[] =
{
@@ -1797,11 +1797,11 @@ BOOL CMotionVehicle::EventFrameInsect(const Event &event) -50,0,0, -65,0,0, -65,0,0, // s0: feet 1..4
};
- bOnBoard = FALSE;
+ bOnBoard = false;
if ( m_object->RetSelect() &&
m_camera->RetType() == CAMERA_ONBOARD )
{
- bOnBoard = TRUE;
+ bOnBoard = true;
}
s = m_physics->RetLinMotionX(MO_MOTSPEED)*1.5f;
@@ -1917,25 +1917,25 @@ BOOL CMotionVehicle::EventFrameInsect(const Event &event) SetInclinaison(dir);
}
- return TRUE;
+ return true;
}
// Event management for a insect cannon.
-BOOL CMotionVehicle::EventFrameCanoni(const Event &event)
+bool CMotionVehicle::EventFrameCanoni(const Event &event)
{
CObject* power;
D3DVECTOR pos, speed;
FPOINT dim;
float zoom, angle, energy, factor;
- BOOL bOnBoard = FALSE;
+ bool bOnBoard = false;
m_canonTime += event.rTime;
if ( m_object->RetSelect() &&
m_camera->RetType() == CAMERA_ONBOARD )
{
- bOnBoard = TRUE;
+ bOnBoard = true;
}
power = m_object->RetPower();
@@ -1947,7 +1947,7 @@ BOOL CMotionVehicle::EventFrameCanoni(const Event &event) {
energy = power->RetEnergy();
}
- if ( energy == 0.0f ) return TRUE;
+ if ( energy == 0.0f ) return true;
factor = 0.5f+energy*0.5f;
if ( bOnBoard ) factor *= 0.8f;
@@ -1992,7 +1992,7 @@ BOOL CMotionVehicle::EventFrameCanoni(const Event &event) }
#endif
- return TRUE;
+ return true;
}
@@ -2056,12 +2056,12 @@ void CMotionVehicle::UpdateTrackMapping(float left, float right, ObjectType type // State management of the pencil drawing robot.
-BOOL CMotionVehicle::RetTraceDown()
+bool CMotionVehicle::RetTraceDown()
{
return m_bTraceDown;
}
-void CMotionVehicle::SetTraceDown(BOOL bDown)
+void CMotionVehicle::SetTraceDown(bool bDown)
{
m_bTraceDown = bDown;
}
diff --git a/src/object/motion/motionvehicle.h b/src/object/motion/motionvehicle.h index 23e6ebc..b9ac0c9 100644 --- a/src/object/motion/motionvehicle.h +++ b/src/object/motion/motionvehicle.h @@ -39,12 +39,12 @@ public: CMotionVehicle(CInstanceManager* iMan, CObject* object);
~CMotionVehicle();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
- BOOL RetTraceDown();
- void SetTraceDown(BOOL bDown);
+ bool RetTraceDown();
+ void SetTraceDown(bool bDown);
int RetTraceColor();
void SetTraceColor(int color);
float RetTraceWidth();
@@ -52,10 +52,10 @@ public: protected:
void CreatePhysics(ObjectType type);
- BOOL EventFrame(const Event &event);
- BOOL EventFrameFly(const Event &event);
- BOOL EventFrameInsect(const Event &event);
- BOOL EventFrameCanoni(const Event &event);
+ bool EventFrame(const Event &event);
+ bool EventFrameFly(const Event &event);
+ bool EventFrameInsect(const Event &event);
+ bool EventFrameCanoni(const Event &event);
void UpdateTrackMapping(float left, float right, ObjectType type);
protected:
@@ -71,8 +71,8 @@ protected: D3DVECTOR m_wheelLastPos;
D3DVECTOR m_wheelLastAngle;
D3DVECTOR m_posKey;
- BOOL m_bFlyFix;
- BOOL m_bTraceDown;
+ bool m_bFlyFix;
+ bool m_bTraceDown;
int m_traceColor;
float m_traceWidth;
};
diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp index 03c6a12..dc33e6e 100644 --- a/src/object/motion/motionworm.cpp +++ b/src/object/motion/motionworm.cpp @@ -69,7 +69,7 @@ CMotionWorm::CMotionWorm(CInstanceManager* iMan, CObject* object) m_armLastAction = -1;
m_specAction = -1;
m_lastParticule = 0.0f;
- m_bArmStop = FALSE;
+ m_bArmStop = false;
}
// Object's destructor.
@@ -81,21 +81,21 @@ CMotionWorm::~CMotionWorm() // Removes an object.
-void CMotionWorm::DeleteObject(BOOL bAll)
+void CMotionWorm::DeleteObject(bool bAll)
{
}
// Creates a vehicle traveling any lands on the ground.
-BOOL CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,
+bool CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
int rank, i;
float px;
- if ( m_engine->RetRestCreate() < 2+WORM_PART+1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 2+WORM_PART+1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -159,7 +159,7 @@ BOOL CMotionWorm::Create(D3DVECTOR pos, float angle, ObjectType type, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates the physics of the object.
@@ -199,21 +199,21 @@ void CMotionWorm::CreatePhysics() // Specifies a special parameter.
-BOOL CMotionWorm::SetParam(int rank, float value)
+bool CMotionWorm::SetParam(int rank, float value)
{
if ( rank == 0 )
{
m_timeDown = value;
- return TRUE;
+ return true;
}
if ( rank == 1 )
{
m_timeUp = value;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
float CMotionWorm::RetParam(int rank)
@@ -227,7 +227,7 @@ float CMotionWorm::RetParam(int rank) // Management of an event.
-BOOL CMotionWorm::EventProcess(const Event &event)
+bool CMotionWorm::EventProcess(const Event &event)
{
CMotion::EventProcess(event);
@@ -240,12 +240,12 @@ BOOL CMotionWorm::EventProcess(const Event &event) {
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CMotionWorm::EventFrame(const Event &event)
+bool CMotionWorm::EventFrame(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR pos, p, angle, speed;
@@ -254,7 +254,7 @@ BOOL CMotionWorm::EventFrame(const Event &event) float floor, a, s, px, curve, phase, h, zoom, radius;
int i, under;
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
s = m_physics->RetLinMotionX(MO_MOTSPEED)/m_physics->RetLinMotionX(MO_ADVSPEED);
a = m_physics->RetCirMotionY(MO_MOTSPEED)/m_physics->RetCirMotionY(MO_ADVSPEED);
@@ -297,10 +297,10 @@ BOOL CMotionWorm::EventFrame(const Event &event) }
m_object->SetVisible(under!=WORM_PART+2);
- if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return TRUE;
+ if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return true;
pos = m_object->RetPosition(0);
- floor = m_terrain->RetFloorLevel(pos, TRUE);
+ floor = m_terrain->RetFloorLevel(pos, true);
mat = m_object->RetWorldMatrix(0);
@@ -328,7 +328,7 @@ BOOL CMotionWorm::EventFrame(const Event &event) pos.z = pp.y;
p = Transform(*mat, pos);
- pos.y += m_terrain->RetFloorLevel(p, TRUE)-floor;
+ pos.y += m_terrain->RetFloorLevel(p, true)-floor;
m_object->SetPosition(i+1, pos);
zoom = Mod(m_armTimeAbs*0.5f+100.0f-i*0.1f, 2.0f);
@@ -372,7 +372,7 @@ BOOL CMotionWorm::EventFrame(const Event &event) }
}
- return TRUE;
+ return true;
}
diff --git a/src/object/motion/motionworm.h b/src/object/motion/motionworm.h index 3422e49..6dca520 100644 --- a/src/object/motion/motionworm.h +++ b/src/object/motion/motionworm.h @@ -39,16 +39,16 @@ public: CMotionWorm(CInstanceManager* iMan, CObject* object);
~CMotionWorm();
- void DeleteObject(BOOL bAll=FALSE);
- BOOL Create(D3DVECTOR pos, float angle, ObjectType type, float power);
- BOOL EventProcess(const Event &event);
+ void DeleteObject(bool bAll=false);
+ bool Create(D3DVECTOR pos, float angle, ObjectType type, float power);
+ bool EventProcess(const Event &event);
- BOOL SetParam(int rank, float value);
+ bool SetParam(int rank, float value);
float RetParam(int rank);
protected:
void CreatePhysics();
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
protected:
float m_timeUp;
@@ -66,7 +66,7 @@ protected: float m_armCirSpeed;
int m_specAction;
float m_specTime;
- BOOL m_bArmStop;
+ bool m_bArmStop;
float m_lastParticule;
};
diff --git a/src/object/object.cpp b/src/object/object.cpp index 8e3818e..9fb7ae8 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -90,8 +90,8 @@ -#define ADJUST_ONBOARD FALSE // TRUE -> adjusts the camera ONBOARD
-#define ADJUST_ARM FALSE // TRUE -> adjusts the manipulator arm
+#define ADJUST_ONBOARD false // true -> adjusts the camera ONBOARD
+#define ADJUST_ARM false // true -> adjusts the manipulator arm
#define VIRUS_DELAY 60.0f // duration of virus infection
#define LOSS_SHIELD 0.24f // loss of the shield by shot
#define LOSS_SHIELD_H 0.10f // loss of the shield for humans
@@ -262,33 +262,33 @@ CObject::CObject(CInstanceManager* iMan) m_range = 0.0f;
m_transparency = 0.0f;
m_lastEnergy = 999.9f;
- m_bHilite = FALSE;
- m_bSelect = FALSE;
- m_bSelectable = TRUE;
- m_bCheckToken = TRUE;
- m_bVisible = TRUE;
- m_bEnable = TRUE;
- m_bGadget = FALSE;
- m_bProxyActivate = FALSE;
- m_bTrainer = FALSE;
- m_bToy = FALSE;
- m_bManual = FALSE;
- m_bFixed = FALSE;
- m_bClip = TRUE;
- m_bShowLimit = FALSE;
+ m_bHilite = false;
+ m_bSelect = false;
+ m_bSelectable = true;
+ m_bCheckToken = true;
+ m_bVisible = true;
+ m_bEnable = true;
+ m_bGadget = false;
+ m_bProxyActivate = false;
+ m_bTrainer = false;
+ m_bToy = false;
+ m_bManual = false;
+ m_bFixed = false;
+ m_bClip = true;
+ m_bShowLimit = false;
m_showLimitRadius = 0.0f;
m_aTime = 0.0f;
m_shotTime = 0.0f;
- m_bVirusMode = FALSE;
+ m_bVirusMode = false;
m_virusTime = 0.0f;
m_lastVirusParticule = 0.0f;
m_totalDesectList = 0;
- m_bLock = FALSE;
- m_bExplo = FALSE;
- m_bCargo = FALSE;
- m_bBurn = FALSE;
- m_bDead = FALSE;
- m_bFlat = FALSE;
+ m_bLock = false;
+ m_bExplo = false;
+ m_bCargo = false;
+ m_bBurn = false;
+ m_bDead = false;
+ m_bFlat = false;
m_gunGoalV = 0.0f;
m_gunGoalH = 0.0f;
m_shieldRadius = 0.0f;
@@ -304,22 +304,22 @@ CObject::CObject(CInstanceManager* iMan) m_character.wheelRight = 1.0f;
m_resetCap = RESET_NONE;
- m_bResetBusy = FALSE;
+ m_bResetBusy = false;
m_resetPosition = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_resetAngle = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_resetRun = -1;
m_cameraType = CAMERA_BACK;
m_cameraDist = 50.0f;
- m_bCameraLock = FALSE;
+ m_bCameraLock = false;
m_infoTotal = 0;
m_infoReturn = NAN;
- m_bInfoUpdate = FALSE;
+ m_bInfoUpdate = false;
for ( i=0 ; i<OBJECTMAXPART ; i++ )
{
- m_objectPart[i].bUsed = FALSE;
+ m_objectPart[i].bUsed = false;
}
m_totalPart = 0;
@@ -370,10 +370,10 @@ CObject::~CObject() // Removes an object.
-// If bAll = TRUE, it does not help,
+// If bAll = true, it does not help,
// because all objects in the scene are quickly destroyed!
-void CObject::DeleteObject(BOOL bAll)
+void CObject::DeleteObject(bool bAll)
{
CObject* pObj;
CPyro* pPyro;
@@ -430,7 +430,7 @@ void CObject::DeleteObject(BOOL bAll) if ( m_bSelect )
{
- SetSelect(FALSE);
+ SetSelect(false);
}
if ( m_type == OBJECT_BASE ||
@@ -501,7 +501,7 @@ void CObject::DeleteObject(BOOL bAll) {
if ( m_objectPart[i].bUsed )
{
- m_objectPart[i].bUsed = FALSE;
+ m_objectPart[i].bUsed = false;
m_engine->DeleteObject(m_objectPart[i].object);
if ( m_objectPart[i].masterParti != -1 )
@@ -515,7 +515,7 @@ void CObject::DeleteObject(BOOL bAll) if ( m_bShowLimit )
{
m_main->FlushShowLimit(0);
- m_bShowLimit = FALSE;
+ m_bShowLimit = false;
}
if ( !bAll ) m_main->CreateShortcuts();
@@ -564,10 +564,10 @@ void CObject::Simplify() // Detonates an object, when struck by a shot.
-// If FALSE is returned, the object is still screwed.
-// If TRUE is returned, the object is destroyed.
+// If false is returned, the object is still screwed.
+// If true is returned, the object is destroyed.
-BOOL CObject::ExploObject(ExploType type, float force, float decay)
+bool CObject::ExploObject(ExploType type, float force, float decay)
{
PyroType pyroType;
CPyro* pyro;
@@ -597,11 +597,11 @@ BOOL CObject::ExploObject(ExploType type, float force, float decay) if ( EXPLO_BOUM )
{
- if ( m_shotTime < 0.5f ) return FALSE;
+ if ( m_shotTime < 0.5f ) return false;
m_shotTime = 0.0f;
}
- if ( m_type == OBJECT_HUMAN && m_bDead ) return FALSE;
+ if ( m_type == OBJECT_HUMAN && m_bDead ) return false;
// Calculate the power lost by the explosion.
if ( force == 0.0f )
@@ -673,7 +673,7 @@ BOOL CObject::ExploObject(ExploType type, float force, float decay) m_type == OBJECT_BULLET )
{
pyroType = PT_BURNO;
- SetBurn(TRUE);
+ SetBurn(true);
}
else if ( m_type == OBJECT_HUMAN )
{
@@ -682,9 +682,9 @@ BOOL CObject::ExploObject(ExploType type, float force, float decay) else
{
pyroType = PT_BURNT;
- SetBurn(TRUE);
+ SetBurn(true);
}
- SetVirusMode(FALSE);
+ SetVirusMode(false);
}
else if ( type == EXPLO_WATER )
{
@@ -766,11 +766,11 @@ BOOL CObject::ExploObject(ExploType type, float force, float decay) m_main->SaveOneScript(this);
}
- if ( shield > 0.0f ) return FALSE; // not dead yet
+ if ( shield > 0.0f ) return false; // not dead yet
if ( RetSelect() )
{
- SetSelect(FALSE); // deselects the object
+ SetSelect(false); // deselects the object
m_camera->SetType(CAMERA_EXPLO);
m_main->DeselectAll();
}
@@ -796,7 +796,7 @@ BOOL CObject::ExploObject(ExploType type, float force, float decay) }
}
- return TRUE;
+ return true;
}
// (*) If a robot or cosmonaut dies, the subject must continue to exist,
@@ -807,7 +807,7 @@ BOOL CObject::ExploObject(ExploType type, float force, float decay) void CObject::InitPart(int part)
{
- m_objectPart[part].bUsed = TRUE;
+ m_objectPart[part].bUsed = true;
m_objectPart[part].object = -1;
m_objectPart[part].parentPart = -1;
@@ -817,9 +817,9 @@ void CObject::InitPart(int part) m_objectPart[part].angle.z = 0.0f;
m_objectPart[part].zoom = D3DVECTOR(1.0f, 1.0f, 1.0f);
- m_objectPart[part].bTranslate = TRUE;
- m_objectPart[part].bRotate = TRUE;
- m_objectPart[part].bZoom = FALSE;
+ m_objectPart[part].bTranslate = true;
+ m_objectPart[part].bRotate = true;
+ m_objectPart[part].bZoom = false;
D3DUtil_SetIdentityMatrix(m_objectPart[part].matTranslate);
D3DUtil_SetIdentityMatrix(m_objectPart[part].matRotate);
@@ -859,7 +859,7 @@ void CObject::DeletePart(int part) m_objectPart[part].masterParti = -1;
}
- m_objectPart[part].bUsed = FALSE;
+ m_objectPart[part].bUsed = false;
m_engine->DeleteObject(m_objectPart[part].object);
UpdateTotalPart();
}
@@ -988,7 +988,7 @@ int CObject::RetID() // Saves all the parameters of the object.
-BOOL CObject::Write(char *line)
+bool CObject::Write(char *line)
{
D3DVECTOR pos;
Info info;
@@ -1161,12 +1161,12 @@ BOOL CObject::Write(char *line) m_auto->Write(line);
}
- return TRUE;
+ return true;
}
// Returns all parameters of the object.
-BOOL CObject::Read(char *line)
+bool CObject::Read(char *line)
{
D3DVECTOR pos, dir;
Info info;
@@ -1251,7 +1251,7 @@ BOOL CObject::Read(char *line) m_auto->Read(line);
}
- return TRUE;
+ return true;
}
@@ -1309,13 +1309,13 @@ int CObject::RetCrashSphereTotal() // Returns a sphere for collisions.
// The position is absolute in the world.
-BOOL CObject::GetCrashSphere(int rank, D3DVECTOR &pos, float &radius)
+bool CObject::GetCrashSphere(int rank, D3DVECTOR &pos, float &radius)
{
if ( rank < 0 || rank >= m_crashSphereUsed )
{
pos = m_objectPart[0].position;
radius = 0.0f;
- return FALSE;
+ return false;
}
// Returns to the sphere collisions,
@@ -1329,7 +1329,7 @@ BOOL CObject::GetCrashSphere(int rank, D3DVECTOR &pos, float &radius) {
pos = m_objectPart[0].position + m_crashSpherePos[0];
radius = m_crashSphereRadius[0];
- return TRUE;
+ return true;
}
if ( m_objectPart[0].bTranslate ||
@@ -1339,7 +1339,7 @@ BOOL CObject::GetCrashSphere(int rank, D3DVECTOR &pos, float &radius) }
pos = Transform(m_objectPart[0].matWorld, m_crashSpherePos[rank]);
radius = m_crashSphereRadius[rank];
- return TRUE;
+ return true;
}
// Returns the hardness of a sphere.
@@ -1440,7 +1440,7 @@ void CObject::SetFloorHeight(float height) }
m_objectPart[0].position.y = pos.y+height+m_character.height;
- m_objectPart[0].bTranslate = TRUE; // it will recalculate the matrices
+ m_objectPart[0].bTranslate = true; // it will recalculate the matrices
}
// Adjust the inclination of an object laying on the ground.
@@ -1477,7 +1477,7 @@ void CObject::SetLinVibration(D3DVECTOR dir) m_linVibration.z != dir.z )
{
m_linVibration = dir;
- m_objectPart[0].bTranslate = TRUE;
+ m_objectPart[0].bTranslate = true;
}
}
@@ -1495,7 +1495,7 @@ void CObject::SetCirVibration(D3DVECTOR dir) m_cirVibration.z != dir.z )
{
m_cirVibration = dir;
- m_objectPart[0].bRotate = TRUE;
+ m_objectPart[0].bRotate = true;
}
}
@@ -1513,7 +1513,7 @@ void CObject::SetInclinaison(D3DVECTOR dir) m_inclinaison.z != dir.z )
{
m_inclinaison = dir;
- m_objectPart[0].bRotate = TRUE;
+ m_objectPart[0].bRotate = true;
}
}
@@ -1532,14 +1532,14 @@ void CObject::SetPosition(int part, const D3DVECTOR &pos) int rank, i, j;
m_objectPart[part].position = pos;
- m_objectPart[part].bTranslate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bTranslate = true; // it will recalculate the matrices
if ( part == 0 && !m_bFlat ) // main part?
{
rank = m_objectPart[0].object;
shPos = pos;
- m_terrain->MoveOnFloor(shPos, TRUE);
+ m_terrain->MoveOnFloor(shPos, true);
m_engine->SetObjectShadowPos(rank, shPos);
if ( m_physics != 0 && m_physics->RetType() == TYPE_FLYING )
@@ -1654,7 +1654,7 @@ D3DVECTOR CObject::RetPosition(int part) void CObject::SetAngle(int part, const D3DVECTOR &angle)
{
m_objectPart[part].angle = angle;
- m_objectPart[part].bRotate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bRotate = true; // it will recalculate the matrices
if ( part == 0 && !m_bFlat ) // main part?
{
@@ -1672,7 +1672,7 @@ D3DVECTOR CObject::RetAngle(int part) void CObject::SetAngleY(int part, float angle)
{
m_objectPart[part].angle.y = angle;
- m_objectPart[part].bRotate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bRotate = true; // it will recalculate the matrices
if ( part == 0 && !m_bFlat ) // main part?
{
@@ -1685,7 +1685,7 @@ void CObject::SetAngleY(int part, float angle) void CObject::SetAngleX(int part, float angle)
{
m_objectPart[part].angle.x = angle;
- m_objectPart[part].bRotate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bRotate = true; // it will recalculate the matrices
}
// Gives the rotation about the axis Z.
@@ -1693,7 +1693,7 @@ void CObject::SetAngleX(int part, float angle) void CObject::SetAngleZ(int part, float angle)
{
m_objectPart[part].angle.z = angle;
- m_objectPart[part].bRotate = TRUE; //it will recalculate the matrices
+ m_objectPart[part].bRotate = true; //it will recalculate the matrices
}
float CObject::RetAngleY(int part)
@@ -1716,7 +1716,7 @@ float CObject::RetAngleZ(int part) void CObject::SetZoom(int part, float zoom)
{
- m_objectPart[part].bTranslate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bTranslate = true; // it will recalculate the matrices
m_objectPart[part].zoom.x = zoom;
m_objectPart[part].zoom.y = zoom;
m_objectPart[part].zoom.z = zoom;
@@ -1728,7 +1728,7 @@ void CObject::SetZoom(int part, float zoom) void CObject::SetZoom(int part, D3DVECTOR zoom)
{
- m_objectPart[part].bTranslate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bTranslate = true; // it will recalculate the matrices
m_objectPart[part].zoom = zoom;
m_objectPart[part].bZoom = ( m_objectPart[part].zoom.x != 1.0f ||
@@ -1743,7 +1743,7 @@ D3DVECTOR CObject::RetZoom(int part) void CObject::SetZoomX(int part, float zoom)
{
- m_objectPart[part].bTranslate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bTranslate = true; // it will recalculate the matrices
m_objectPart[part].zoom.x = zoom;
m_objectPart[part].bZoom = ( m_objectPart[part].zoom.x != 1.0f ||
@@ -1753,7 +1753,7 @@ void CObject::SetZoomX(int part, float zoom) void CObject::SetZoomY(int part, float zoom)
{
- m_objectPart[part].bTranslate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bTranslate = true; // it will recalculate the matrices
m_objectPart[part].zoom.y = zoom;
m_objectPart[part].bZoom = ( m_objectPart[part].zoom.x != 1.0f ||
@@ -1763,7 +1763,7 @@ void CObject::SetZoomY(int part, float zoom) void CObject::SetZoomZ(int part, float zoom)
{
- m_objectPart[part].bTranslate = TRUE; // it will recalculate the matrices
+ m_objectPart[part].bTranslate = true; // it will recalculate the matrices
m_objectPart[part].zoom.z = zoom;
m_objectPart[part].bZoom = ( m_objectPart[part].zoom.x != 1.0f ||
@@ -1795,7 +1795,7 @@ float CObject::RetWaterLevel() }
-void CObject::SetTrainer(BOOL bEnable)
+void CObject::SetTrainer(bool bEnable)
{
m_bTrainer = bEnable;
@@ -1805,27 +1805,27 @@ void CObject::SetTrainer(BOOL bEnable) }
}
-BOOL CObject::RetTrainer()
+bool CObject::RetTrainer()
{
return m_bTrainer;
}
-void CObject::SetToy(BOOL bEnable)
+void CObject::SetToy(bool bEnable)
{
m_bToy = bEnable;
}
-BOOL CObject::RetToy()
+bool CObject::RetToy()
{
return m_bToy;
}
-void CObject::SetManual(BOOL bManual)
+void CObject::SetManual(bool bManual)
{
m_bManual = bManual;
}
-BOOL CObject::RetManual()
+bool CObject::RetManual()
{
return m_bManual;
}
@@ -1840,12 +1840,12 @@ ResetCap CObject::RetResetCap() return m_resetCap;
}
-void CObject::SetResetBusy(BOOL bBusy)
+void CObject::SetResetBusy(bool bBusy)
{
m_bResetBusy = bBusy;
}
-BOOL CObject::RetResetBusy()
+bool CObject::RetResetBusy()
{
return m_bResetBusy;
}
@@ -1951,7 +1951,7 @@ int CObject::RetTruckPart() void CObject::InfoFlush()
{
m_infoTotal = 0;
- m_bInfoUpdate = TRUE;
+ m_bInfoUpdate = true;
}
void CObject::DeleteInfo(int rank)
@@ -1965,7 +1965,7 @@ void CObject::DeleteInfo(int rank) m_info[i] = m_info[i+1];
}
m_infoTotal --;
- m_bInfoUpdate = TRUE;
+ m_bInfoUpdate = true;
}
void CObject::SetInfo(int rank, Info info)
@@ -1974,7 +1974,7 @@ void CObject::SetInfo(int rank, Info info) m_info[rank] = info;
if ( rank+1 > m_infoTotal ) m_infoTotal = rank+1;
- m_bInfoUpdate = TRUE;
+ m_bInfoUpdate = true;
}
Info CObject::RetInfo(int rank)
@@ -1998,22 +1998,22 @@ float CObject::RetInfoReturn() return m_infoReturn;
}
-void CObject::SetInfoUpdate(BOOL bUpdate)
+void CObject::SetInfoUpdate(bool bUpdate)
{
m_bInfoUpdate = bUpdate;
}
-BOOL CObject::RetInfoUpdate()
+bool CObject::RetInfoUpdate()
{
return m_bInfoUpdate;
}
-BOOL CObject::SetCmdLine(int rank, float value)
+bool CObject::SetCmdLine(int rank, float value)
{
- if ( rank < 0 || rank >= OBJECTMAXCMDLINE ) return FALSE;
+ if ( rank < 0 || rank >= OBJECTMAXCMDLINE ) return false;
m_cmdLine[rank] = value;
- return TRUE;
+ return true;
}
float CObject::RetCmdLine(int rank)
@@ -2054,7 +2054,7 @@ D3DMATRIX* CObject::RetWorldMatrix(int part) // Indicates whether the object should be drawn below the interface.
-void CObject::SetDrawWorld(BOOL bDraw)
+void CObject::SetDrawWorld(bool bDraw)
{
int i;
@@ -2069,7 +2069,7 @@ void CObject::SetDrawWorld(BOOL bDraw) // Indicates whether the object should be drawn over the interface.
-void CObject::SetDrawFront(BOOL bDraw)
+void CObject::SetDrawFront(bool bDraw)
{
int i;
@@ -2085,8 +2085,8 @@ void CObject::SetDrawFront(BOOL bDraw) // Creates a vehicle traveling any pose on the floor.
-BOOL CObject::CreateVehicle(D3DVECTOR pos, float angle, ObjectType type,
- float power, BOOL bTrainer, BOOL bToy)
+bool CObject::CreateVehicle(D3DVECTOR pos, float angle, ObjectType type,
+ float power, bool bTrainer, bool bToy)
{
m_type = type;
@@ -2094,7 +2094,7 @@ BOOL CObject::CreateVehicle(D3DVECTOR pos, float angle, ObjectType type, {
m_motion = new CMotionToto(m_iMan, this);
m_motion->Create(pos, angle, type, 1.0f);
- return TRUE;
+ return true;
}
SetTrainer(bTrainer);
@@ -2144,7 +2144,7 @@ BOOL CObject::CreateVehicle(D3DVECTOR pos, float angle, ObjectType type, {
m_motion = new CMotionVehicle(m_iMan, this);
}
- if ( m_motion == 0 ) return FALSE;
+ if ( m_motion == 0 ) return false;
m_physics->SetMotion(m_motion);
m_brain->SetMotion(m_motion);
@@ -2170,15 +2170,15 @@ BOOL CObject::CreateVehicle(D3DVECTOR pos, float angle, ObjectType type, delete m_motion;
m_motion = 0;
}
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
// Creates an insect lands on any ground.
-BOOL CObject::CreateInsect(D3DVECTOR pos, float angle, ObjectType type)
+bool CObject::CreateInsect(D3DVECTOR pos, float angle, ObjectType type)
{
m_type = type;
@@ -2208,7 +2208,7 @@ BOOL CObject::CreateInsect(D3DVECTOR pos, float angle, ObjectType type) {
m_motion = new CMotionWorm(m_iMan, this);
}
- if ( m_motion == 0 ) return FALSE;
+ if ( m_motion == 0 ) return false;
m_physics->SetMotion(m_motion);
m_brain->SetMotion(m_motion);
@@ -2234,20 +2234,20 @@ BOOL CObject::CreateInsect(D3DVECTOR pos, float angle, ObjectType type) delete m_motion;
m_motion = 0;
}
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
// Creates shade under a vehicle as a negative light.
-BOOL CObject::CreateShadowLight(float height, D3DCOLORVALUE color)
+bool CObject::CreateShadowLight(float height, D3DCOLORVALUE color)
{
D3DLIGHT7 light;
D3DVECTOR pos;
- if ( !m_engine->RetLightMode() ) return TRUE;
+ if ( !m_engine->RetLightMode() ) return true;
pos = RetPosition(0);
m_shadowHeight = height;
@@ -2272,14 +2272,14 @@ BOOL CObject::CreateShadowLight(float height, D3DCOLORVALUE color) light.dvPhi = PI/4.0f;
m_shadowLight = m_light->CreateLight();
- if ( m_shadowLight == -1 ) return FALSE;
+ if ( m_shadowLight == -1 ) return false;
m_light->SetLight(m_shadowLight, light);
// Only illuminates the objects on the ground.
m_light->SetLightIncluType(m_shadowLight, TYPETERRAIN);
- return TRUE;
+ return true;
}
// Returns the number of negative light shade.
@@ -2291,11 +2291,11 @@ int CObject::RetShadowLight() // Creates light for the effects of a vehicle.
-BOOL CObject::CreateEffectLight(float height, D3DCOLORVALUE color)
+bool CObject::CreateEffectLight(float height, D3DCOLORVALUE color)
{
D3DLIGHT7 light;
- if ( !m_engine->RetLightMode() ) return TRUE;
+ if ( !m_engine->RetLightMode() ) return true;
m_effectHeight = height;
@@ -2319,12 +2319,12 @@ BOOL CObject::CreateEffectLight(float height, D3DCOLORVALUE color) light.dvPhi = PI/4.0f;
m_effectLight = m_light->CreateLight();
- if ( m_effectLight == -1 ) return FALSE;
+ if ( m_effectLight == -1 ) return false;
m_light->SetLight(m_effectLight, light);
m_light->SetLightIntensity(m_effectLight, 0.0f);
- return TRUE;
+ return true;
}
// Returns the number of light effects.
@@ -2336,12 +2336,12 @@ int CObject::RetEffectLight() // Creates the circular shadow underneath a vehicle.
-BOOL CObject::CreateShadowCircle(float radius, float intensity,
+bool CObject::CreateShadowCircle(float radius, float intensity,
D3DShadowType type)
{
float zoom;
- if ( intensity == 0.0f ) return TRUE;
+ if ( intensity == 0.0f ) return true;
zoom = RetZoomX(0);
@@ -2353,19 +2353,19 @@ BOOL CObject::CreateShadowCircle(float radius, float intensity, m_engine->SetObjectShadowAngle(m_objectPart[0].object, m_objectPart[0].angle.y);
m_engine->SetObjectShadowType(m_objectPart[0].object, type);
- return TRUE;
+ return true;
}
// Creates a building laying on the ground.
-BOOL CObject::CreateBuilding(D3DVECTOR pos, float angle, float height,
+bool CObject::CreateBuilding(D3DVECTOR pos, float angle, float height,
ObjectType type, float power)
{
CModFile* pModFile;
FPOINT p;
int rank, i;
- if ( m_engine->RetRestCreate() < 20 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 20 ) return false;
pModFile = new CModFile(m_iMan);
@@ -3250,12 +3250,12 @@ BOOL CObject::CreateBuilding(D3DVECTOR pos, float angle, float height, m_engine->LoadAllTexture();
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a small resource set on the ground.
-BOOL CObject::CreateResource(D3DVECTOR pos, float angle, ObjectType type,
+bool CObject::CreateResource(D3DVECTOR pos, float angle, ObjectType type,
float power)
{
CModFile* pModFile;
@@ -3265,7 +3265,7 @@ BOOL CObject::CreateResource(D3DVECTOR pos, float angle, ObjectType type, if ( type != OBJECT_SHOW )
{
- if ( m_engine->RetRestCreate() < 1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1 ) return false;
}
pModFile = new CModFile(m_iMan);
@@ -3318,7 +3318,7 @@ BOOL CObject::CreateResource(D3DVECTOR pos, float angle, ObjectType type, if ( type == OBJECT_SHOW ) // remains in the air?
{
delete pModFile;
- return TRUE;
+ return true;
}
radius = 1.5f;
@@ -3371,18 +3371,18 @@ BOOL CObject::CreateResource(D3DVECTOR pos, float angle, ObjectType type, SetPosition(0, pos); // to display the shadows immediately
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a flag placed on the ground.
-BOOL CObject::CreateFlag(D3DVECTOR pos, float angle, ObjectType type)
+bool CObject::CreateFlag(D3DVECTOR pos, float angle, ObjectType type)
{
CModFile* pModFile;
char name[50];
int rank, i;
- if ( m_engine->RetRestCreate() < 1+4 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1+4 ) return false;
pModFile = new CModFile(m_iMan);
@@ -3434,18 +3434,18 @@ BOOL CObject::CreateFlag(D3DVECTOR pos, float angle, ObjectType type) SetPosition(0, pos); // to display the shadows immediately
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a barrier placed on the ground.
-BOOL CObject::CreateBarrier(D3DVECTOR pos, float angle, float height,
+bool CObject::CreateBarrier(D3DVECTOR pos, float angle, float height,
ObjectType type)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -3537,18 +3537,18 @@ BOOL CObject::CreateBarrier(D3DVECTOR pos, float angle, float height, SetPosition(0, pos);
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a plant placed on the ground.
-BOOL CObject::CreatePlant(D3DVECTOR pos, float angle, float height,
+bool CObject::CreatePlant(D3DVECTOR pos, float angle, float height,
ObjectType type)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -3791,18 +3791,18 @@ BOOL CObject::CreatePlant(D3DVECTOR pos, float angle, float height, SetPosition(0, pos);
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a mushroom placed on the ground.
-BOOL CObject::CreateMushroom(D3DVECTOR pos, float angle, float height,
+bool CObject::CreateMushroom(D3DVECTOR pos, float angle, float height,
ObjectType type)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -3853,12 +3853,12 @@ BOOL CObject::CreateMushroom(D3DVECTOR pos, float angle, float height, SetPosition(0, pos);
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a toy placed on the ground.
-BOOL CObject::CreateTeen(D3DVECTOR pos, float angle, float zoom, float height,
+bool CObject::CreateTeen(D3DVECTOR pos, float angle, float zoom, float height,
ObjectType type)
{
CModFile* pModFile;
@@ -3866,9 +3866,9 @@ BOOL CObject::CreateTeen(D3DVECTOR pos, float angle, float zoom, float height, D3DCOLORVALUE color;
int rank;
float fShadow;
- BOOL bFloorAdjust = TRUE;
+ bool bFloorAdjust = true;
- if ( m_engine->RetRestCreate() < 1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -3990,7 +3990,7 @@ BOOL CObject::CreateTeen(D3DVECTOR pos, float angle, float zoom, float height, SetAngleY(0, angle);
SetZoom(0, zoom);
SetFloorHeight(0.0f);
- bFloorAdjust = FALSE;
+ bFloorAdjust = false;
m_terrain->AddBuildingLevel(pos, 5.9f, 6.1f, 0.2f, 0.5f);
CreateShadowCircle(8.0f, 0.2f*fShadow);
@@ -4464,7 +4464,7 @@ BOOL CObject::CreateTeen(D3DVECTOR pos, float angle, float zoom, float height, SetPosition(0, pos);
SetAngleY(0, angle);
SetZoom(0, zoom);
- bFloorAdjust = FALSE;
+ bFloorAdjust = false;
}
if ( type == OBJECT_TEEN30 ) // jump?
@@ -4580,7 +4580,7 @@ BOOL CObject::CreateTeen(D3DVECTOR pos, float angle, float zoom, float height, SetPosition(0, pos);
SetAngleY(0, angle);
SetZoom(0, zoom);
- bFloorAdjust = FALSE;
+ bFloorAdjust = false;
}
if ( type == OBJECT_TEEN37 ) // boat?
@@ -4593,7 +4593,7 @@ BOOL CObject::CreateTeen(D3DVECTOR pos, float angle, float zoom, float height, SetPosition(0, pos);
SetAngleY(0, angle);
SetZoom(0, zoom);
- bFloorAdjust = FALSE;
+ bFloorAdjust = false;
}
if ( type == OBJECT_TEEN38 ) // fan?
@@ -4734,19 +4734,19 @@ BOOL CObject::CreateTeen(D3DVECTOR pos, float angle, float zoom, float height, SetPosition(0, pos);
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a crystal placed on the ground.
-BOOL CObject::CreateQuartz(D3DVECTOR pos, float angle, float height,
+bool CObject::CreateQuartz(D3DVECTOR pos, float angle, float height,
ObjectType type)
{
CModFile* pModFile;
float radius;
int rank;
- if ( m_engine->RetRestCreate() < 1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -4847,18 +4847,18 @@ BOOL CObject::CreateQuartz(D3DVECTOR pos, float angle, float height, m_particule->CreateParticule(pos, pos, FPOINT(2.0f, 2.0f), PARTIQUARTZ, 0.7f+Rand()*0.7f, radius, 0.0f);
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a root placed on the ground.
-BOOL CObject::CreateRoot(D3DVECTOR pos, float angle, float height,
+bool CObject::CreateRoot(D3DVECTOR pos, float angle, float height,
ObjectType type)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -5024,18 +5024,18 @@ BOOL CObject::CreateRoot(D3DVECTOR pos, float angle, float height, SetPosition(0, pos);
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a small home.
-BOOL CObject::CreateHome(D3DVECTOR pos, float angle, float height,
+bool CObject::CreateHome(D3DVECTOR pos, float angle, float height,
ObjectType type)
{
CModFile* pModFile;
int rank;
- if ( m_engine->RetRestCreate() < 1 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1 ) return false;
pModFile = new CModFile(m_iMan);
@@ -5068,19 +5068,19 @@ BOOL CObject::CreateHome(D3DVECTOR pos, float angle, float height, SetPosition(0, pos);
delete pModFile;
- return TRUE;
+ return true;
}
// Creates ruin placed on the ground.
-BOOL CObject::CreateRuin(D3DVECTOR pos, float angle, float height,
+bool CObject::CreateRuin(D3DVECTOR pos, float angle, float height,
ObjectType type)
{
CModFile* pModFile;
char name[50];
int rank;
- if ( m_engine->RetRestCreate() < 1+4 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 1+4 ) return false;
pModFile = new CModFile(m_iMan);
@@ -5495,17 +5495,17 @@ BOOL CObject::CreateRuin(D3DVECTOR pos, float angle, float height, }
delete pModFile;
- return TRUE;
+ return true;
}
// Creates a gadget apollo.
-BOOL CObject::CreateApollo(D3DVECTOR pos, float angle, ObjectType type)
+bool CObject::CreateApollo(D3DVECTOR pos, float angle, ObjectType type)
{
CModFile* pModFile;
int rank, i;
- if ( m_engine->RetRestCreate() < 6 ) return FALSE;
+ if ( m_engine->RetRestCreate() < 6 ) return false;
pModFile = new CModFile(m_iMan);
@@ -5690,7 +5690,7 @@ BOOL CObject::CreateApollo(D3DVECTOR pos, float angle, ObjectType type) SetPosition(0, pos); // to display the shadows immediately
delete pModFile;
- return TRUE;
+ return true;
}
// Creates all sub-objects for managing the object.
@@ -5804,65 +5804,65 @@ void CObject::CreateOtherObject(ObjectType type) // Reads a program.
-BOOL CObject::ReadProgram(int rank, char* filename)
+bool CObject::ReadProgram(int rank, char* filename)
{
if ( m_brain != 0 )
{
return m_brain->ReadProgram(rank, filename);
}
- return FALSE;
+ return false;
}
// Writes a program.
-BOOL CObject::WriteProgram(int rank, char* filename)
+bool CObject::WriteProgram(int rank, char* filename)
{
if ( m_brain != 0 )
{
return m_brain->WriteProgram(rank, filename);
}
- return FALSE;
+ return false;
}
// Starts a program.
-BOOL CObject::RunProgram(int rank)
+bool CObject::RunProgram(int rank)
{
if ( m_brain != 0 )
{
m_brain->RunProgram(rank);
- return TRUE;
+ return true;
}
if ( m_auto != 0 )
{
m_auto->Start(rank);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// Calculates the matrix for transforming the object.
-// Returns TRUE if the matrix has changed.
+// Returns true if the matrix has changed.
// The rotations occur in the order Y, Z and X.
-BOOL CObject::UpdateTransformObject(int part, BOOL bForceUpdate)
+bool CObject::UpdateTransformObject(int part, bool bForceUpdate)
{
D3DVECTOR position, angle, eye;
- BOOL bModif = FALSE;
+ bool bModif = false;
int parent;
if ( m_truck != 0 ) // transported by truck?
{
- m_objectPart[part].bTranslate = TRUE;
- m_objectPart[part].bRotate = TRUE;
+ m_objectPart[part].bTranslate = true;
+ m_objectPart[part].bRotate = true;
}
if ( !bForceUpdate &&
!m_objectPart[part].bTranslate &&
- !m_objectPart[part].bRotate ) return FALSE;
+ !m_objectPart[part].bRotate ) return false;
position = m_objectPart[part].position;
angle = m_objectPart[part].angle;
@@ -5905,7 +5905,7 @@ BOOL CObject::UpdateTransformObject(int part, BOOL bForceUpdate) m_objectPart[part].matTransform = m_objectPart[part].matRotate *
m_objectPart[part].matTranslate;
}
- bModif = TRUE;
+ bModif = true;
}
if ( bForceUpdate ||
@@ -5933,7 +5933,7 @@ BOOL CObject::UpdateTransformObject(int part, BOOL bForceUpdate) m_objectPart[parent].matWorld;
}
}
- bModif = TRUE;
+ bModif = true;
}
if ( bModif )
@@ -5942,8 +5942,8 @@ BOOL CObject::UpdateTransformObject(int part, BOOL bForceUpdate) m_objectPart[part].matWorld);
}
- m_objectPart[part].bTranslate = FALSE;
- m_objectPart[part].bRotate = FALSE;
+ m_objectPart[part].bTranslate = false;
+ m_objectPart[part].bRotate = false;
return bModif;
}
@@ -5952,9 +5952,9 @@ BOOL CObject::UpdateTransformObject(int part, BOOL bForceUpdate) // Assume a maximum of 4 degrees of freedom.
// Appropriate, for example, to a body, an arm, forearm, hand and fingers.
-BOOL CObject::UpdateTransformObject()
+bool CObject::UpdateTransformObject()
{
- BOOL bUpdate1, bUpdate2, bUpdate3, bUpdate4;
+ bool bUpdate1, bUpdate2, bUpdate3, bUpdate4;
int level1, level2, level3, level4, rank;
int parent1, parent2, parent3, parent4;
@@ -5963,13 +5963,13 @@ BOOL CObject::UpdateTransformObject() for ( level1=0 ; level1<m_totalPart ; level1++ )
{
if ( !m_objectPart[level1].bUsed ) continue;
- UpdateTransformObject(level1, FALSE);
+ UpdateTransformObject(level1, false);
}
}
else
{
parent1 = 0;
- bUpdate1 = UpdateTransformObject(parent1, FALSE);
+ bUpdate1 = UpdateTransformObject(parent1, false);
for ( level1=0 ; level1<m_totalPart ; level1++ )
{
@@ -6007,7 +6007,7 @@ BOOL CObject::UpdateTransformObject() }
}
- return TRUE;
+ return true;
}
@@ -6035,7 +6035,7 @@ void CObject::FlatParent() m_objectPart[i].parentPart = -1; // more parents
}
- m_bFlat = TRUE;
+ m_bFlat = true;
}
@@ -6102,7 +6102,7 @@ void CObject::UpdateEnergyMapping() // Manual action.
-BOOL CObject::EventProcess(const Event &event)
+bool CObject::EventProcess(const Event &event)
{
if ( event.event == EVENT_KEYDOWN )
{
@@ -6156,7 +6156,7 @@ BOOL CObject::EventProcess(const Event &event) if ( !m_bDead ) m_camera->SetType(CAMERA_EXPLO);
m_main->DeselectAll();
}
- return FALSE;
+ return false;
}
}
@@ -6183,21 +6183,21 @@ BOOL CObject::EventProcess(const Event &event) return EventFrame(event);
}
- return TRUE;
+ return true;
}
// Animates the object.
-BOOL CObject::EventFrame(const Event &event)
+bool CObject::EventFrame(const Event &event)
{
if ( m_type == OBJECT_HUMAN && m_main->RetMainMovie() == MM_SATCOMopen )
{
UpdateTransformObject();
- return TRUE;
+ return true;
}
- if ( m_type != OBJECT_SHOW && m_engine->RetPause() ) return TRUE;
+ if ( m_type != OBJECT_SHOW && m_engine->RetPause() ) return true;
m_aTime += event.rTime;
m_shotTime += event.rTime;
@@ -6219,7 +6219,7 @@ BOOL CObject::EventFrame(const Event &event) dist = Length(eye, RetPosition(0));
if ( dist < m_proxyDistance )
{
- m_bProxyActivate = FALSE;
+ m_bProxyActivate = false;
m_main->CreateShortcuts();
m_sound->Play(SOUND_FINDING);
pyro = new CPyro(m_iMan);
@@ -6228,7 +6228,7 @@ BOOL CObject::EventFrame(const Event &event) }
}
- return TRUE;
+ return true;
}
// Updates the mapping of the object.
@@ -6259,7 +6259,7 @@ void CObject::VirusFrame(float rTime) m_virusTime += rTime;
if ( m_virusTime >= VIRUS_DELAY )
{
- m_bVirusMode = FALSE; // the virus is no longer active
+ m_bVirusMode = false; // the virus is no longer active
}
if ( m_lastVirusParticule+m_engine->ParticuleAdapt(0.2f) <= m_aTime )
@@ -6638,12 +6638,12 @@ ObjectMaterial CObject::RetMaterial() // Indicates whether the gadget is a nonessential.
-void CObject::SetGadget(BOOL bMode)
+void CObject::SetGadget(bool bMode)
{
m_bGadget = bMode;
}
-BOOL CObject::RetGadget()
+bool CObject::RetGadget()
{
return m_bGadget;
}
@@ -6651,12 +6651,12 @@ BOOL CObject::RetGadget() // Indicates whether an object is stationary (ant on the back).
-void CObject::SetFixed(BOOL bFixed)
+void CObject::SetFixed(bool bFixed)
{
m_bFixed = bFixed;
}
-BOOL CObject::RetFixed()
+bool CObject::RetFixed()
{
return m_bFixed;
}
@@ -6664,12 +6664,12 @@ BOOL CObject::RetFixed() // Indicates whether an object is subjected to clipping (obstacles).
-void CObject::SetClip(BOOL bClip)
+void CObject::SetClip(bool bClip)
{
m_bClip = bClip;
}
-BOOL CObject::RetClip()
+bool CObject::RetClip()
{
return m_bClip;
}
@@ -6678,7 +6678,7 @@ BOOL CObject::RetClip() // Pushes an object.
-BOOL CObject::JostleObject(float force)
+bool CObject::JostleObject(float force)
{
CAutoJostle* pa;
@@ -6688,26 +6688,26 @@ BOOL CObject::JostleObject(float force) m_type == OBJECT_FLAGy ||
m_type == OBJECT_FLAGv ) // flag?
{
- if ( m_auto == 0 ) return FALSE;
+ if ( m_auto == 0 ) return false;
m_auto->Start(1);
}
else
{
- if ( m_auto != 0 ) return FALSE;
+ if ( m_auto != 0 ) return false;
m_auto = new CAutoJostle(m_iMan, this);
pa = (CAutoJostle*)m_auto;
pa->Start(0, force);
}
- return TRUE;
+ return true;
}
// Beginning of the effect when the instruction "detect" is used.
-void CObject::StartDetectEffect(CObject *target, BOOL bFound)
+void CObject::StartDetectEffect(CObject *target, bool bFound)
{
D3DMATRIX* mat;
D3DVECTOR pos, goal;
@@ -6748,7 +6748,7 @@ void CObject::StartDetectEffect(CObject *target, BOOL bFound) // Management of time from which a virus is active.
-void CObject::SetVirusMode(BOOL bEnable)
+void CObject::SetVirusMode(bool bEnable)
{
m_bVirusMode = bEnable;
m_virusTime = 0.0f;
@@ -6757,12 +6757,12 @@ void CObject::SetVirusMode(BOOL bEnable) {
if ( !m_brain->IntroduceVirus() ) // tries to infect
{
- m_bVirusMode = FALSE; // program was not contaminated!
+ m_bVirusMode = false; // program was not contaminated!
}
}
}
-BOOL CObject::RetVirusMode()
+bool CObject::RetVirusMode()
{
return m_bVirusMode;
}
@@ -6795,12 +6795,12 @@ float CObject::RetCameraDist() return m_cameraDist;
}
-void CObject::SetCameraLock(BOOL bLock)
+void CObject::SetCameraLock(bool bLock)
{
m_bCameraLock = bLock;
}
-BOOL CObject::RetCameraLock()
+bool CObject::RetCameraLock()
{
return m_bCameraLock;
}
@@ -6809,7 +6809,7 @@ BOOL CObject::RetCameraLock() // Management of the demonstration of the object.
-void CObject::SetHilite(BOOL bMode)
+void CObject::SetHilite(bool bMode)
{
int list[OBJECTMAXPART+1];
int i, j;
@@ -6832,7 +6832,7 @@ void CObject::SetHilite(BOOL bMode) }
}
-BOOL CObject::RetHilite()
+bool CObject::RetHilite()
{
return m_bHilite;
}
@@ -6840,7 +6840,7 @@ BOOL CObject::RetHilite() // Indicates whether the object is selected or not.
-void CObject::SetSelect(BOOL bMode, BOOL bDisplayError)
+void CObject::SetSelect(bool bMode, bool bDisplayError)
{
Error err;
@@ -6881,23 +6881,23 @@ void CObject::SetSelect(BOOL bMode, BOOL bDisplayError) // Indicates whether the object is selected or not.
-BOOL CObject::RetSelect(BOOL bReal)
+bool CObject::RetSelect(bool bReal)
{
- if ( !bReal && m_main->RetFixScene() ) return FALSE;
+ if ( !bReal && m_main->RetFixScene() ) return false;
return m_bSelect;
}
// Indicates whether the object is selectable or not.
-void CObject::SetSelectable(BOOL bMode)
+void CObject::SetSelectable(bool bMode)
{
m_bSelectable = bMode;
}
// Indicates whether the object is selecionnable or not.
-BOOL CObject::RetSelectable()
+bool CObject::RetSelectable()
{
return m_bSelectable;
}
@@ -6905,7 +6905,7 @@ BOOL CObject::RetSelectable() // Management of the activities of an object.
-void CObject::SetActivity(BOOL bMode)
+void CObject::SetActivity(bool bMode)
{
if ( m_brain != 0 )
{
@@ -6913,26 +6913,26 @@ void CObject::SetActivity(BOOL bMode) }
}
-BOOL CObject::RetActivity()
+bool CObject::RetActivity()
{
if ( m_brain != 0 )
{
return m_brain->RetActivity();
}
- return FALSE;
+ return false;
}
// Indicates if necessary to check the tokens of the object.
-void CObject::SetCheckToken(BOOL bMode)
+void CObject::SetCheckToken(bool bMode)
{
m_bCheckToken = bMode;
}
// Indicates if necessary to check the tokens of the object.
-BOOL CObject::RetCheckToken()
+bool CObject::RetCheckToken()
{
return m_bCheckToken;
}
@@ -6942,12 +6942,12 @@ BOOL CObject::RetCheckToken() // The object is not hidden or visually disabled, but ignores detections!
// For example: underground worm.
-void CObject::SetVisible(BOOL bVisible)
+void CObject::SetVisible(bool bVisible)
{
m_bVisible = bVisible;
}
-BOOL CObject::RetVisible()
+bool CObject::RetVisible()
{
return m_bVisible;
}
@@ -6958,12 +6958,12 @@ BOOL CObject::RetVisible() // This mode is used for objects "resetables"
// during training to simulate destruction.
-void CObject::SetEnable(BOOL bEnable)
+void CObject::SetEnable(bool bEnable)
{
m_bEnable = bEnable;
}
-BOOL CObject::RetEnable()
+bool CObject::RetEnable()
{
return m_bEnable;
}
@@ -6971,12 +6971,12 @@ BOOL CObject::RetEnable() // Management mode or an object is only active when you're close.
-void CObject::SetProxyActivate(BOOL bActivate)
+void CObject::SetProxyActivate(bool bActivate)
{
m_bProxyActivate = bActivate;
}
-BOOL CObject::RetProxyActivate()
+bool CObject::RetProxyActivate()
{
return m_bProxyActivate;
}
@@ -7022,12 +7022,12 @@ float CObject::RetParam() // For example, a cube of titanium is blocked while it is used to make something,
//or a vehicle is blocked as its construction is not finished.
-void CObject::SetLock(BOOL bLock)
+void CObject::SetLock(bool bLock)
{
m_bLock = bLock;
}
-BOOL CObject::RetLock()
+bool CObject::RetLock()
{
return m_bLock;
}
@@ -7035,12 +7035,12 @@ BOOL CObject::RetLock() // Management of the mode "current explosion" of an object.
// An object in this mode is not saving.
-void CObject::SetExplo(BOOL bExplo)
+void CObject::SetExplo(bool bExplo)
{
m_bExplo = bExplo;
}
-BOOL CObject::RetExplo()
+bool CObject::RetExplo()
{
return m_bExplo;
}
@@ -7048,12 +7048,12 @@ BOOL CObject::RetExplo() // Mode management "cargo ship" during movies.
-void CObject::SetCargo(BOOL bCargo)
+void CObject::SetCargo(bool bCargo)
{
m_bCargo = bCargo;
}
-BOOL CObject::RetCargo()
+bool CObject::RetCargo()
{
return m_bCargo;
}
@@ -7061,7 +7061,7 @@ BOOL CObject::RetCargo() // Management of the HS mode of an object.
-void CObject::SetBurn(BOOL bBurn)
+void CObject::SetBurn(bool bBurn)
{
m_bBurn = bBurn;
@@ -7072,12 +7072,12 @@ void CObject::SetBurn(BOOL bBurn) //? }
}
-BOOL CObject::RetBurn()
+bool CObject::RetBurn()
{
return m_bBurn;
}
-void CObject::SetDead(BOOL bDead)
+void CObject::SetDead(bool bDead)
{
m_bDead = bDead;
@@ -7093,17 +7093,17 @@ void CObject::SetDead(BOOL bDead) //? }
}
-BOOL CObject::RetDead()
+bool CObject::RetDead()
{
return m_bDead;
}
-BOOL CObject::RetRuin()
+bool CObject::RetRuin()
{
return m_bBurn|m_bFlat;
}
-BOOL CObject::RetActif()
+bool CObject::RetActif()
{
return !m_bLock && !m_bBurn && !m_bFlat && m_bVisible && m_bEnable;
}
@@ -7193,27 +7193,27 @@ float CObject::RetGunGoalH() // Shows the limits of the object.
-BOOL CObject::StartShowLimit()
+bool CObject::StartShowLimit()
{
- if ( m_showLimitRadius == 0.0f ) return FALSE;
+ if ( m_showLimitRadius == 0.0f ) return false;
m_main->SetShowLimit(0, PARTILIMIT1, this, RetPosition(0), m_showLimitRadius);
- m_bShowLimit = TRUE;
- return TRUE;
+ m_bShowLimit = true;
+ return true;
}
void CObject::StopShowLimit()
{
- m_bShowLimit = FALSE;
+ m_bShowLimit = false;
}
// Indicates whether a program is under execution.
-BOOL CObject::IsProgram()
+bool CObject::IsProgram()
{
- if ( m_brain == 0 ) return FALSE;
+ if ( m_brain == 0 ) return false;
return m_brain->IsProgram();
}
@@ -7501,7 +7501,7 @@ int CObject::RetDefRank() // Gives the object name for the tooltip.
-BOOL CObject::GetTooltipName(char* name)
+bool CObject::GetTooltipName(char* name)
{
GetResource(RES_OBJECT, m_type, name);
return ( name[0] != 0 );
@@ -7556,15 +7556,15 @@ void CObject::DeleteDeselList(CObject* pObj) // Management of the state of the pencil drawing robot.
-BOOL CObject::RetTraceDown()
+bool CObject::RetTraceDown()
{
CMotionVehicle* mv;
- if ( m_motion == 0 ) return FALSE;
+ if ( m_motion == 0 ) return false;
mv = (CMotionVehicle*)m_motion;
return mv->RetTraceDown();
}
-void CObject::SetTraceDown(BOOL bDown)
+void CObject::SetTraceDown(bool bDown)
{
CMotionVehicle* mv;
if ( m_motion == 0 ) return;
diff --git a/src/object/object.h b/src/object/object.h index 08f413b..b6f993a 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -370,11 +370,11 @@ public: CObject(CInstanceManager* iMan);
~CObject();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
void Simplify();
- BOOL ExploObject(ExploType type, float force, float decay=1.0f);
+ bool ExploObject(ExploType type, float force, float decay=1.0f);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void UpdateMapping();
int CreatePart();
@@ -391,30 +391,30 @@ public: void SetID(int id);
int RetID();
- BOOL Write(char *line);
- BOOL Read(char *line);
-
- void SetDrawWorld(BOOL bDraw);
- void SetDrawFront(BOOL bDraw);
-
- BOOL CreateVehicle(D3DVECTOR pos, float angle, ObjectType type, float power, BOOL bTrainer, BOOL bToy);
- BOOL CreateInsect(D3DVECTOR pos, float angle, ObjectType type);
- BOOL CreateBuilding(D3DVECTOR pos, float angle, float height, ObjectType type, float power=1.0f);
- BOOL CreateResource(D3DVECTOR pos, float angle, ObjectType type, float power=1.0f);
- BOOL CreateFlag(D3DVECTOR pos, float angle, ObjectType type);
- BOOL CreateBarrier(D3DVECTOR pos, float angle, float height, ObjectType type);
- BOOL CreatePlant(D3DVECTOR pos, float angle, float height, ObjectType type);
- BOOL CreateMushroom(D3DVECTOR pos, float angle, float height, ObjectType type);
- BOOL CreateTeen(D3DVECTOR pos, float angle, float zoom, float height, ObjectType type);
- BOOL CreateQuartz(D3DVECTOR pos, float angle, float height, ObjectType type);
- BOOL CreateRoot(D3DVECTOR pos, float angle, float height, ObjectType type);
- BOOL CreateHome(D3DVECTOR pos, float angle, float height, ObjectType type);
- BOOL CreateRuin(D3DVECTOR pos, float angle, float height, ObjectType type);
- BOOL CreateApollo(D3DVECTOR pos, float angle, ObjectType type);
-
- BOOL ReadProgram(int rank, char* filename);
- BOOL WriteProgram(int rank, char* filename);
- BOOL RunProgram(int rank);
+ bool Write(char *line);
+ bool Read(char *line);
+
+ void SetDrawWorld(bool bDraw);
+ void SetDrawFront(bool bDraw);
+
+ bool CreateVehicle(D3DVECTOR pos, float angle, ObjectType type, float power, bool bTrainer, bool bToy);
+ bool CreateInsect(D3DVECTOR pos, float angle, ObjectType type);
+ bool CreateBuilding(D3DVECTOR pos, float angle, float height, ObjectType type, float power=1.0f);
+ bool CreateResource(D3DVECTOR pos, float angle, ObjectType type, float power=1.0f);
+ bool CreateFlag(D3DVECTOR pos, float angle, ObjectType type);
+ bool CreateBarrier(D3DVECTOR pos, float angle, float height, ObjectType type);
+ bool CreatePlant(D3DVECTOR pos, float angle, float height, ObjectType type);
+ bool CreateMushroom(D3DVECTOR pos, float angle, float height, ObjectType type);
+ bool CreateTeen(D3DVECTOR pos, float angle, float zoom, float height, ObjectType type);
+ bool CreateQuartz(D3DVECTOR pos, float angle, float height, ObjectType type);
+ bool CreateRoot(D3DVECTOR pos, float angle, float height, ObjectType type);
+ bool CreateHome(D3DVECTOR pos, float angle, float height, ObjectType type);
+ bool CreateRuin(D3DVECTOR pos, float angle, float height, ObjectType type);
+ bool CreateApollo(D3DVECTOR pos, float angle, ObjectType type);
+
+ bool ReadProgram(int rank, char* filename);
+ bool WriteProgram(int rank, char* filename);
+ bool RunProgram(int rank);
int RetShadowLight();
int RetEffectLight();
@@ -422,7 +422,7 @@ public: void FlushCrashShere();
int CreateCrashSphere(D3DVECTOR pos, float radius, Sound sound, float hardness=0.45f);
int RetCrashSphereTotal();
- BOOL GetCrashSphere(int rank, D3DVECTOR &pos, float &radius);
+ bool GetCrashSphere(int rank, D3DVECTOR &pos, float &radius);
float RetCrashSphereHardness(int rank);
Sound RetCrashSphereSound(int rank);
void DeleteCrashSphere(int rank);
@@ -465,19 +465,19 @@ public: float RetWaterLevel();
- void SetTrainer(BOOL bEnable);
- BOOL RetTrainer();
+ void SetTrainer(bool bEnable);
+ bool RetTrainer();
- void SetToy(BOOL bEnable);
- BOOL RetToy();
+ void SetToy(bool bEnable);
+ bool RetToy();
- void SetManual(BOOL bManual);
- BOOL RetManual();
+ void SetManual(bool bManual);
+ bool RetManual();
void SetResetCap(ResetCap cap);
ResetCap RetResetCap();
- void SetResetBusy(BOOL bBusy);
- BOOL RetResetBusy();
+ void SetResetBusy(bool bBusy);
+ bool RetResetBusy();
void SetResetPosition(const D3DVECTOR &pos);
D3DVECTOR RetResetPosition();
void SetResetAngle(const D3DVECTOR &angle);
@@ -504,10 +504,10 @@ public: int RetInfoTotal();
void SetInfoReturn(float value);
float RetInfoReturn();
- void SetInfoUpdate(BOOL bUpdate);
- BOOL RetInfoUpdate();
+ void SetInfoUpdate(bool bUpdate);
+ bool RetInfoUpdate();
- BOOL SetCmdLine(int rank, float value);
+ bool SetCmdLine(int rank, float value);
float RetCmdLine(int rank);
D3DMATRIX* RetRotateMatrix(int part);
@@ -540,53 +540,53 @@ public: ObjectMaterial RetMaterial();
- void SetGadget(BOOL bMode);
- BOOL RetGadget();
+ void SetGadget(bool bMode);
+ bool RetGadget();
- void SetFixed(BOOL bFixed);
- BOOL RetFixed();
+ void SetFixed(bool bFixed);
+ bool RetFixed();
- void SetClip(BOOL bClip);
- BOOL RetClip();
+ void SetClip(bool bClip);
+ bool RetClip();
- BOOL JostleObject(float force);
+ bool JostleObject(float force);
- void StartDetectEffect(CObject *target, BOOL bFound);
+ void StartDetectEffect(CObject *target, bool bFound);
- void SetVirusMode(BOOL bEnable);
- BOOL RetVirusMode();
+ void SetVirusMode(bool bEnable);
+ bool RetVirusMode();
float RetVirusTime();
void SetCameraType(CameraType type);
CameraType RetCameraType();
void SetCameraDist(float dist);
float RetCameraDist();
- void SetCameraLock(BOOL bLock);
- BOOL RetCameraLock();
+ void SetCameraLock(bool bLock);
+ bool RetCameraLock();
- void SetHilite(BOOL bMode);
- BOOL RetHilite();
+ void SetHilite(bool bMode);
+ bool RetHilite();
- void SetSelect(BOOL bMode, BOOL bDisplayError=TRUE);
- BOOL RetSelect(BOOL bReal=FALSE);
+ void SetSelect(bool bMode, bool bDisplayError=true);
+ bool RetSelect(bool bReal=false);
- void SetSelectable(BOOL bMode);
- BOOL RetSelectable();
+ void SetSelectable(bool bMode);
+ bool RetSelectable();
- void SetActivity(BOOL bMode);
- BOOL RetActivity();
+ void SetActivity(bool bMode);
+ bool RetActivity();
- void SetVisible(BOOL bVisible);
- BOOL RetVisible();
+ void SetVisible(bool bVisible);
+ bool RetVisible();
- void SetEnable(BOOL bEnable);
- BOOL RetEnable();
+ void SetEnable(bool bEnable);
+ bool RetEnable();
- void SetCheckToken(BOOL bMode);
- BOOL RetCheckToken();
+ void SetCheckToken(bool bMode);
+ bool RetCheckToken();
- void SetProxyActivate(BOOL bActivate);
- BOOL RetProxyActivate();
+ void SetProxyActivate(bool bActivate);
+ bool RetProxyActivate();
void SetProxyDistance(float distance);
float RetProxyDistance();
@@ -596,28 +596,28 @@ public: void SetParam(float value);
float RetParam();
- void SetExplo(BOOL bExplo);
- BOOL RetExplo();
- void SetLock(BOOL bLock);
- BOOL RetLock();
- void SetCargo(BOOL bCargo);
- BOOL RetCargo();
- void SetBurn(BOOL bBurn);
- BOOL RetBurn();
- void SetDead(BOOL bDead);
- BOOL RetDead();
- BOOL RetRuin();
- BOOL RetActif();
+ void SetExplo(bool bExplo);
+ bool RetExplo();
+ void SetLock(bool bLock);
+ bool RetLock();
+ void SetCargo(bool bCargo);
+ bool RetCargo();
+ void SetBurn(bool bBurn);
+ bool RetBurn();
+ void SetDead(bool bDead);
+ bool RetDead();
+ bool RetRuin();
+ bool RetActif();
void SetGunGoalV(float gunGoal);
void SetGunGoalH(float gunGoal);
float RetGunGoalV();
float RetGunGoalH();
- BOOL StartShowLimit();
+ bool StartShowLimit();
void StopShowLimit();
- BOOL IsProgram();
+ bool IsProgram();
void CreateSelectParticule();
void SetRunScript(CScript* script);
@@ -632,27 +632,27 @@ public: void SetDefRank(int rank);
int RetDefRank();
- BOOL GetTooltipName(char* name);
+ bool GetTooltipName(char* name);
void AddDeselList(CObject* pObj);
CObject* SubDeselList();
void DeleteDeselList(CObject* pObj);
- BOOL CreateShadowCircle(float radius, float intensity, D3DShadowType type=D3DSHADOWNORM);
- BOOL CreateShadowLight(float height, D3DCOLORVALUE color);
- BOOL CreateEffectLight(float height, D3DCOLORVALUE color);
+ bool CreateShadowCircle(float radius, float intensity, D3DShadowType type=D3DSHADOWNORM);
+ bool CreateShadowLight(float height, D3DCOLORVALUE color);
+ bool CreateEffectLight(float height, D3DCOLORVALUE color);
void FlatParent();
- BOOL RetTraceDown();
- void SetTraceDown(BOOL bDown);
+ bool RetTraceDown();
+ void SetTraceDown(bool bDown);
int RetTraceColor();
void SetTraceColor(int color);
float RetTraceWidth();
void SetTraceWidth(float width);
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
void VirusFrame(float rTime);
void PartiFrame(float rTime);
void CreateOtherObject(ObjectType type);
@@ -660,8 +660,8 @@ protected: void UpdateTotalPart();
int SearchDescendant(int parent, int n);
void UpdateEnergyMapping();
- BOOL UpdateTransformObject(int part, BOOL bForceUpdate);
- BOOL UpdateTransformObject();
+ bool UpdateTransformObject(int part, bool bForceUpdate);
+ bool UpdateTransformObject();
void UpdateSelectParticule();
protected:
@@ -708,36 +708,36 @@ protected: int m_material; // matter(0..n)
float m_aTime;
float m_shotTime; // time since last shot
- BOOL m_bVirusMode; // virus activated/triggered
+ bool m_bVirusMode; // virus activated/triggered
float m_virusTime; // lifetime of the virus
float m_lastVirusParticule;
float m_lastParticule;
- BOOL m_bHilite;
- BOOL m_bSelect; // object selected
- BOOL m_bSelectable; // selectable object
- BOOL m_bCheckToken; // object with audited tokens
- BOOL m_bVisible; // object active but undetectable
- BOOL m_bEnable; // dead object
- BOOL m_bProxyActivate; // active object so close
- BOOL m_bGadget; // object nonessential
- BOOL m_bLock;
- BOOL m_bExplo;
- BOOL m_bCargo;
- BOOL m_bBurn;
- BOOL m_bDead;
- BOOL m_bFlat;
- BOOL m_bTrainer; // drive vehicle (without remote)
- BOOL m_bToy; // toy key
- BOOL m_bManual; // manual control (Scribbler)
- BOOL m_bFixed;
- BOOL m_bClip;
- BOOL m_bShowLimit;
+ bool m_bHilite;
+ bool m_bSelect; // object selected
+ bool m_bSelectable; // selectable object
+ bool m_bCheckToken; // object with audited tokens
+ bool m_bVisible; // object active but undetectable
+ bool m_bEnable; // dead object
+ bool m_bProxyActivate; // active object so close
+ bool m_bGadget; // object nonessential
+ bool m_bLock;
+ bool m_bExplo;
+ bool m_bCargo;
+ bool m_bBurn;
+ bool m_bDead;
+ bool m_bFlat;
+ bool m_bTrainer; // drive vehicle (without remote)
+ bool m_bToy; // toy key
+ bool m_bManual; // manual control (Scribbler)
+ bool m_bFixed;
+ bool m_bClip;
+ bool m_bShowLimit;
float m_showLimitRadius;
float m_gunGoalV;
float m_gunGoalH;
CameraType m_cameraType;
float m_cameraDist;
- BOOL m_bCameraLock;
+ bool m_bCameraLock;
int m_defRank;
float m_magnifyDamage;
float m_proxyDistance;
@@ -763,7 +763,7 @@ protected: int m_partiSel[4];
ResetCap m_resetCap;
- BOOL m_bResetBusy;
+ bool m_bResetBusy;
D3DVECTOR m_resetPosition;
D3DVECTOR m_resetAngle;
int m_resetRun;
@@ -771,7 +771,7 @@ protected: int m_infoTotal;
Info m_info[OBJECTMAXINFO];
float m_infoReturn;
- BOOL m_bInfoUpdate;
+ bool m_bInfoUpdate;
float m_cmdLine[OBJECTMAXCMDLINE];
};
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 0a55285..d072f66 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -80,7 +80,7 @@ -#define CBOT_STACK TRUE // saves the stack of programs CBOT
+#define CBOT_STACK true // saves the stack of programs CBOT
#define UNIT 4.0f
@@ -131,62 +131,62 @@ CBotTypResult cPoint(CBotVar* pThis, CBotVar* &var) //Execution of the class "point".
-BOOL rPoint(CBotVar* pThis, CBotVar* var, CBotVar* pResult, int& Exception)
+bool rPoint(CBotVar* pThis, CBotVar* var, CBotVar* pResult, int& Exception)
{
CBotVar *pX, *pY, *pZ;
- if ( var == NULL ) return TRUE; // constructor with no parameters is ok
+ if ( var == NULL ) return true; // constructor with no parameters is ok
if ( var->GivType() > CBotTypDouble )
{
- Exception = CBotErrBadNum; return FALSE;
+ Exception = CBotErrBadNum; return false;
}
pX = pThis->GivItem("x");
if ( pX == NULL )
{
- Exception = CBotErrUndefItem; return FALSE;
+ Exception = CBotErrUndefItem; return false;
}
pX->SetValFloat( var->GivValFloat() );
var = var->GivNext();
if ( var == NULL )
{
- Exception = CBotErrLowParam; return FALSE;
+ Exception = CBotErrLowParam; return false;
}
if ( var->GivType() > CBotTypDouble )
{
- Exception = CBotErrBadNum; return FALSE;
+ Exception = CBotErrBadNum; return false;
}
pY = pThis->GivItem("y");
if ( pY == NULL )
{
- Exception = CBotErrUndefItem; return FALSE;
+ Exception = CBotErrUndefItem; return false;
}
pY->SetValFloat( var->GivValFloat() );
var = var->GivNext();
if ( var == NULL )
{
- return TRUE; // ok with only two parameters
+ return true; // ok with only two parameters
}
pZ = pThis->GivItem("z");
if ( pZ == NULL )
{
- Exception = CBotErrUndefItem; return FALSE;
+ Exception = CBotErrUndefItem; return false;
}
pZ->SetValFloat( var->GivValFloat() );
var = var->GivNext();
if ( var != NULL )
{
- Exception = CBotErrOverParam; return FALSE;
+ Exception = CBotErrOverParam; return false;
}
- return TRUE; // no interruption
+ return true; // no interruption
}
@@ -238,30 +238,30 @@ CRobotMain::CRobotMain(CInstanceManager* iMan) m_visitObject = 0;
m_visitArrow = 0;
m_audioTrack = 0;
- m_bAudioRepeat = TRUE;
+ m_bAudioRepeat = true;
m_delayWriteMessage = 0;
m_selectObject = 0;
m_infoUsed = 0;
- m_bBeginSatCom = FALSE;
- m_bMovieLock = FALSE;
- m_bSatComLock = FALSE;
- m_bEditLock = FALSE;
- m_bEditFull = FALSE;
- m_bPause = FALSE;
- m_bHilite = FALSE;
- m_bFreePhoto = FALSE;
- m_bShowPos = FALSE;
- m_bSelectInsect = FALSE;
- m_bShowSoluce = FALSE;
- m_bShowAll = FALSE;
- m_bCheatRadar = FALSE;
- m_bFixScene = FALSE;
- m_bTrainerPilot = FALSE;
- m_bSuspend = FALSE;
- m_bFriendAim = FALSE;
- m_bResetCreate = FALSE;
- m_bShortCut = TRUE;
+ m_bBeginSatCom = false;
+ m_bMovieLock = false;
+ m_bSatComLock = false;
+ m_bEditLock = false;
+ m_bEditFull = false;
+ m_bPause = false;
+ m_bHilite = false;
+ m_bFreePhoto = false;
+ m_bShowPos = false;
+ m_bSelectInsect = false;
+ m_bShowSoluce = false;
+ m_bShowAll = false;
+ m_bCheatRadar = false;
+ m_bFixScene = false;
+ m_bTrainerPilot = false;
+ m_bSuspend = false;
+ m_bFriendAim = false;
+ m_bResetCreate = false;
+ m_bShortCut = true;
m_engine->SetMovieLock(m_bMovieLock);
@@ -274,7 +274,7 @@ CRobotMain::CRobotMain(CInstanceManager* iMan) m_endingWinRank = 0;
m_endingLostRank = 0;
- m_bWinTerminate = FALSE;
+ m_bWinTerminate = false;
FlushDisplayInfo();
@@ -288,7 +288,7 @@ CRobotMain::CRobotMain(CInstanceManager* iMan) if ( GetProfileFloat("Edit", "WindowDim.x", fValue) ) m_windowDim.x = fValue;
if ( GetProfileFloat("Edit", "WindowDim.y", fValue) ) m_windowDim.y = fValue;
- m_IOPublic = FALSE;
+ m_IOPublic = false;
m_IODim = FPOINT(320.0f/640.0f, (121.0f+18.0f*8)/480.0f);
m_IOPos.x = (1.0f-m_IODim.x)/2.0f; // in the middle
m_IOPos.y = (1.0f-m_IODim.y)/2.0f;
@@ -321,7 +321,7 @@ CRobotMain::CRobotMain(CInstanceManager* iMan) for ( i=0 ; i<MAXSHOWLIMIT ; i++ )
{
- m_showLimit[i].bUsed = FALSE;
+ m_showLimit[i].bUsed = false;
m_showLimit[i].total = 0;
m_showLimit[i].link = 0;
}
@@ -381,7 +381,7 @@ CRobotMain::CRobotMain(CInstanceManager* iMan) // Add the class Point.
CBotClass* bc;
- bc = new CBotClass("point", NULL, TRUE); // intrinsic class
+ bc = new CBotClass("point", NULL, true); // intrinsic class
bc->AddItem("x", CBotTypFloat);
bc->AddItem("y", CBotTypFloat);
bc->AddItem("z", CBotTypFloat);
@@ -447,7 +447,7 @@ void CRobotMain::ChangePhase(Phase phase) float ox, oy, sx, sy;
char* read;
int rank, numTry;
- BOOL bLoading;
+ bool bLoading;
if ( m_phase == PHASE_SIMUL ) // ends a simulation?
{
@@ -456,7 +456,7 @@ void CRobotMain::ChangePhase(Phase phase) m_camera->SetObject(0);
#if _SCHOOL
- if ( TRUE )
+ if ( true )
#else
if ( m_gameTime > 10.0f ) // did you play at least 10 seconds?
#endif
@@ -471,7 +471,7 @@ void CRobotMain::ChangePhase(Phase phase) if ( phase == PHASE_WIN ) // wins a simulation?
{
rank = m_dialog->RetSceneRank();
- m_dialog->SetGamerInfoPassed(rank, TRUE);
+ m_dialog->SetGamerInfoPassed(rank, true);
m_dialog->NextMission(); // passes to the next mission
m_dialog->WriteGamerInfo();
}
@@ -481,22 +481,22 @@ void CRobotMain::ChangePhase(Phase phase) m_phase = phase;
m_winDelay = 0.0f;
m_lostDelay = 0.0f;
- m_bBeginSatCom = FALSE;
- m_bMovieLock = FALSE;
- m_bSatComLock = FALSE;
- m_bEditLock = FALSE;
- m_bFreePhoto = FALSE;
- m_bResetCreate = FALSE;
+ m_bBeginSatCom = false;
+ m_bMovieLock = false;
+ m_bSatComLock = false;
+ m_bEditLock = false;
+ m_bFreePhoto = false;
+ m_bResetCreate = false;
m_engine->SetMovieLock(m_bMovieLock);
- ChangePause(FALSE);
+ ChangePause(false);
FlushDisplayInfo();
m_engine->SetRankView(0);
m_engine->FlushObject();
color.r = color.g = color.b = color.a = 0.0f;
m_engine->SetWaterAddColor(color);
m_engine->SetBackground("");
- m_engine->SetBackForce(FALSE);
+ m_engine->SetBackForce(false);
m_engine->SetFrontsizeName("");
m_engine->SetOverColor();
m_engine->GroundMarkDelete(0);
@@ -524,7 +524,7 @@ void CRobotMain::ChangePhase(Phase phase) m_movieInfoIndex = -1;
m_cameraPan = 0.0f;
m_cameraZoom = 0.0f;
- m_bShortCut = TRUE;
+ m_bShortCut = true;
// Creates and hide the command console.
dim.x = 200.0f/640.0f;
@@ -534,7 +534,7 @@ void CRobotMain::ChangePhase(Phase phase) pe = m_interface->CreateEdit(pos, dim, 0, EVENT_CMD);
if ( pe == 0 ) return;
pe->ClearState(STATE_VISIBLE);
- m_bCmdEdit = FALSE; // hidden for now
+ m_bCmdEdit = false; // hidden for now
// Creates the speedometer.
#if _TEEN
@@ -564,9 +564,9 @@ void CRobotMain::ChangePhase(Phase phase) if ( m_phase != PHASE_PERSO )
{
- m_engine->SetDrawWorld(TRUE);
- m_engine->SetDrawFront(FALSE);
- m_bFixScene = FALSE;
+ m_engine->SetDrawWorld(true);
+ m_engine->SetDrawFront(false);
+ m_bFixScene = false;
}
if ( m_phase == PHASE_INIT )
@@ -656,7 +656,7 @@ void CRobotMain::ChangePhase(Phase phase) bLoading = (read[0] != 0);
m_map->CreateMap();
- CreateScene(m_dialog->RetSceneSoluce(), FALSE, FALSE); // interactive scene
+ CreateScene(m_dialog->RetSceneSoluce(), false, false); // interactive scene
if ( m_bMapImage )
{
m_map->SetFixImage(m_mapFilename);
@@ -671,7 +671,7 @@ void CRobotMain::ChangePhase(Phase phase) if ( m_bImmediatSatCom && !bLoading &&
m_infoFilename[SATCOM_HUSTON][0] != 0 )
{
- StartDisplayInfo(SATCOM_HUSTON, FALSE); // shows the instructions
+ StartDisplayInfo(SATCOM_HUSTON, false); // shows the instructions
}
m_sound->StopMusic();
@@ -694,7 +694,7 @@ void CRobotMain::ChangePhase(Phase phase) m_dialog->SetSceneName("win");
#endif
m_dialog->SetSceneRank(m_endingWinRank);
- CreateScene(FALSE, TRUE, FALSE); // sets scene
+ CreateScene(false, true, false); // sets scene
pos.x = ox+sx*1; pos.y = oy+sy*1;
ddim.x = dim.x*2; ddim.y = dim.y*2;
@@ -707,17 +707,17 @@ void CRobotMain::ChangePhase(Phase phase) ddim.x = dim.x*15; ddim.y = dim.y*2;
pe = m_interface->CreateEdit(pos, ddim, 0, EVENT_EDIT0);
pe->SetFontType(FONT_COLOBOT);
- pe->SetEditCap(FALSE);
- pe->SetHiliteCap(FALSE);
+ pe->SetEditCap(false);
+ pe->SetHiliteCap(false);
pe->ReadText("help\\teenw.txt");
#else
pos.x = ox+sx*3; pos.y = oy+sy*0.2f;
ddim.x = dim.x*15; ddim.y = dim.y*3.0f;
pe = m_interface->CreateEdit(pos, ddim, 0, EVENT_EDIT0);
- pe->SetGenericMode(TRUE);
+ pe->SetGenericMode(true);
pe->SetFontType(FONT_COLOBOT);
- pe->SetEditCap(FALSE);
- pe->SetHiliteCap(FALSE);
+ pe->SetEditCap(false);
+ pe->SetHiliteCap(false);
pe->ReadText("help\\win.txt");
#endif
}
@@ -738,10 +738,10 @@ void CRobotMain::ChangePhase(Phase phase) }
else
{
- m_bWinTerminate = FALSE;
+ m_bWinTerminate = false;
m_dialog->SetSceneName("lost");
m_dialog->SetSceneRank(m_endingLostRank);
- CreateScene(FALSE, TRUE, FALSE); // sets scene
+ CreateScene(false, true, false); // sets scene
pos.x = ox+sx*1; pos.y = oy+sy*1;
ddim.x = dim.x*2; ddim.y = dim.y*2;
@@ -762,11 +762,11 @@ void CRobotMain::ChangePhase(Phase phase) if ( m_phase == PHASE_LOADING )
{
- m_engine->SetMouseHide(TRUE);
+ m_engine->SetMouseHide(true);
}
else
{
- m_engine->SetMouseHide(FALSE);
+ m_engine->SetMouseHide(false);
}
m_engine->LoadAllTexture();
@@ -775,7 +775,7 @@ void CRobotMain::ChangePhase(Phase phase) // Processes an event.
-BOOL CRobotMain::EventProcess(const Event &event)
+bool CRobotMain::EventProcess(const Event &event)
{
CEdit* pe;
CObject* pObj;
@@ -790,12 +790,12 @@ BOOL CRobotMain::EventProcess(const Event &event) type = m_movie->RetStopType();
if ( type == MM_SATCOMopen )
{
- ChangePause(FALSE);
- SelectObject(m_infoObject, FALSE); // hands over the command buttons
+ ChangePause(false);
+ SelectObject(m_infoObject, false); // hands over the command buttons
m_map->ShowMap(m_bMapShow);
- m_displayText->HideText(FALSE);
+ m_displayText->HideText(false);
i = m_movieInfoIndex;
- StartDisplayInfo(m_movieInfoIndex, FALSE);
+ StartDisplayInfo(m_movieInfoIndex, false);
m_movieInfoIndex = i;
}
}
@@ -827,26 +827,26 @@ BOOL CRobotMain::EventProcess(const Event &event) #endif
{
pe = (CEdit*)m_interface->SearchControl(EVENT_CMD);
- if ( pe == 0 ) return FALSE;
+ if ( pe == 0 ) return false;
pe->SetState(STATE_VISIBLE);
- pe->SetFocus(TRUE);
- if ( m_phase == PHASE_SIMUL ) ChangePause(TRUE);
- m_bCmdEdit = TRUE;
- return FALSE;
+ pe->SetFocus(true);
+ if ( m_phase == PHASE_SIMUL ) ChangePause(true);
+ m_bCmdEdit = true;
+ return false;
}
if ( event.event == EVENT_KEYDOWN &&
event.param == VK_RETURN && m_bCmdEdit )
{
char cmd[50];
pe = (CEdit*)m_interface->SearchControl(EVENT_CMD);
- if ( pe == 0 ) return FALSE;
+ if ( pe == 0 ) return false;
pe->GetText(cmd, 50);
pe->SetText("");
pe->ClearState(STATE_VISIBLE);
- if ( m_phase == PHASE_SIMUL ) ChangePause(FALSE);
+ if ( m_phase == PHASE_SIMUL ) ChangePause(false);
ExecuteCmd(cmd);
- m_bCmdEdit = FALSE;
- return FALSE;
+ m_bCmdEdit = false;
+ return false;
}
// Management of the speed change.
@@ -862,12 +862,12 @@ BOOL CRobotMain::EventProcess(const Event &event) m_lastMousePos = event.pos;
HiliteObject(event.pos);
}
- return FALSE;
+ return false;
}
if ( !m_displayText->EventProcess(event) )
{
- return FALSE;
+ return false;
}
if ( event.event == EVENT_MOUSEMOVE )
@@ -895,7 +895,7 @@ BOOL CRobotMain::EventProcess(const Event &event) {
StopDisplayInfo();
}
- return FALSE;
+ return false;
}
// Simulation phase of the game
@@ -916,21 +916,21 @@ BOOL CRobotMain::EventProcess(const Event &event) if ( event.param == VK_F11 )
{
m_particule->WriteWheelTrace("Savegame\\t.bmp", 256, 256, D3DVECTOR(16.0f, 0.0f, -368.0f), D3DVECTOR(140.0f, 0.0f, -248.0f));
- return FALSE;
+ return false;
}
if ( m_bEditLock ) // current edition?
{
if ( event.param == m_engine->RetKey(KEYRANK_HELP, 0) ||
event.param == m_engine->RetKey(KEYRANK_HELP, 1) )
{
- StartDisplayInfo(SATCOM_HUSTON, FALSE);
- return FALSE;
+ StartDisplayInfo(SATCOM_HUSTON, false);
+ return false;
}
if ( event.param == m_engine->RetKey(KEYRANK_PROG, 0) ||
event.param == m_engine->RetKey(KEYRANK_PROG, 1) )
{
- StartDisplayInfo(SATCOM_PROG, FALSE);
- return FALSE;
+ StartDisplayInfo(SATCOM_PROG, false);
+ return false;
}
break;
}
@@ -942,7 +942,7 @@ BOOL CRobotMain::EventProcess(const Event &event) {
AbortMovie();
}
- return FALSE;
+ return false;
}
if ( m_camera->RetType() == CAMERA_VISIT )
{
@@ -957,14 +957,14 @@ BOOL CRobotMain::EventProcess(const Event &event) {
StopDisplayVisit();
}
- return FALSE;
+ return false;
}
if ( event.param == m_engine->RetKey(KEYRANK_QUIT, 0) ||
event.param == m_engine->RetKey(KEYRANK_QUIT, 1) )
{
if ( m_movie->IsExist() )
{
- StartDisplayInfo(SATCOM_HUSTON, FALSE);
+ StartDisplayInfo(SATCOM_HUSTON, false);
}
else if ( m_winDelay > 0.0f )
{
@@ -1017,12 +1017,12 @@ BOOL CRobotMain::EventProcess(const Event &event) if ( event.param == m_engine->RetKey(KEYRANK_HELP, 0) ||
event.param == m_engine->RetKey(KEYRANK_HELP, 1) )
{
- StartDisplayInfo(SATCOM_HUSTON, TRUE);
+ StartDisplayInfo(SATCOM_HUSTON, true);
}
if ( event.param == m_engine->RetKey(KEYRANK_PROG, 0) ||
event.param == m_engine->RetKey(KEYRANK_PROG, 1) )
{
- StartDisplayInfo(SATCOM_PROG, TRUE);
+ StartDisplayInfo(SATCOM_PROG, true);
}
if ( event.param == m_engine->RetKey(KEYRANK_VISIT, 0) ||
event.param == m_engine->RetKey(KEYRANK_VISIT, 1) )
@@ -1068,7 +1068,7 @@ BOOL CRobotMain::EventProcess(const Event &event) {
if ( !m_bEditLock )
{
- StartDisplayInfo(SATCOM_HUSTON, TRUE);
+ StartDisplayInfo(SATCOM_HUSTON, true);
}
}
}
@@ -1086,7 +1086,7 @@ BOOL CRobotMain::EventProcess(const Event &event) case EVENT_BUTTON_QUIT:
if ( m_movie->IsExist() )
{
- StartDisplayInfo(SATCOM_HUSTON, FALSE);
+ StartDisplayInfo(SATCOM_HUSTON, false);
}
else if ( m_winDelay > 0.0f )
{
@@ -1139,11 +1139,11 @@ BOOL CRobotMain::EventProcess(const Event &event) break;
case EVENT_OBJECT_BHELP:
- StartDisplayInfo(SATCOM_HUSTON, TRUE);
+ StartDisplayInfo(SATCOM_HUSTON, true);
break;
case EVENT_OBJECT_SOLUCE:
- StartDisplayInfo(SATCOM_SOLUCE, TRUE);
+ StartDisplayInfo(SATCOM_SOLUCE, true);
break;
case EVENT_OBJECT_MAPZOOM:
@@ -1199,7 +1199,7 @@ BOOL CRobotMain::EventProcess(const Event &event) }
EventObject(event);
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_PERSO )
@@ -1263,10 +1263,10 @@ BOOL CRobotMain::EventProcess(const Event &event) }
m_model->EventProcess(event);
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
@@ -1333,12 +1333,12 @@ void CRobotMain::ExecuteCmd(char *cmd) if ( m_bFreePhoto )
{
m_camera->SetType(CAMERA_FREE);
- ChangePause(TRUE);
+ ChangePause(true);
}
else
{
m_camera->SetType(CAMERA_BACK);
- ChangePause(FALSE);
+ ChangePause(false);
}
return;
}
@@ -1349,17 +1349,17 @@ void CRobotMain::ExecuteCmd(char *cmd) if ( m_bFreePhoto )
{
m_camera->SetType(CAMERA_FREE);
- ChangePause(TRUE);
+ ChangePause(true);
DeselectAll(); // removes the control buttons
- m_map->ShowMap(FALSE);
- m_displayText->HideText(TRUE);
+ m_map->ShowMap(false);
+ m_displayText->HideText(true);
}
else
{
m_camera->SetType(CAMERA_BACK);
- ChangePause(FALSE);
+ ChangePause(false);
m_map->ShowMap(m_bMapShow);
- m_displayText->HideText(FALSE);
+ m_displayText->HideText(false);
}
return;
}
@@ -1371,7 +1371,7 @@ void CRobotMain::ExecuteCmd(char *cmd) object = RetSelect();
if ( object != 0 )
{
- object->SetClip(FALSE);
+ object->SetClip(false);
}
return;
}
@@ -1383,7 +1383,7 @@ void CRobotMain::ExecuteCmd(char *cmd) object = RetSelect();
if ( object != 0 )
{
- object->SetClip(TRUE);
+ object->SetClip(true);
}
return;
}
@@ -1607,11 +1607,11 @@ void CRobotMain::FlushDisplayInfo() // Beginning of the displaying of instructions.
// index: SATCOM_*
-void CRobotMain::StartDisplayInfo(int index, BOOL bMovie)
+void CRobotMain::StartDisplayInfo(int index, bool bMovie)
{
CObject* pObj;
CMotion* motion;
- BOOL bHuman;
+ bool bHuman;
if ( m_bCmdEdit || m_bSatComLock ) return;
@@ -1625,10 +1625,10 @@ void CRobotMain::StartDisplayInfo(int index, BOOL bMovie) {
m_movieInfoIndex = index;
m_movie->Start(MM_SATCOMopen, 2.5f);
- ChangePause(TRUE);
-//? m_map->ShowMap(FALSE);
+ ChangePause(true);
+//? m_map->ShowMap(false);
m_infoObject = DeselectAll(); // removes the control buttons
- m_displayText->HideText(TRUE);
+ m_displayText->HideText(true);
return;
}
}
@@ -1636,10 +1636,10 @@ void CRobotMain::StartDisplayInfo(int index, BOOL bMovie) if ( m_movie->IsExist() )
{
m_movie->Stop();
- ChangePause(FALSE);
- SelectObject(m_infoObject, FALSE); // hands over the command buttons
+ ChangePause(false);
+ SelectObject(m_infoObject, false); // hands over the command buttons
//? m_map->ShowMap(m_bMapShow);
- m_displayText->HideText(FALSE);
+ m_displayText->HideText(false);
}
StartDisplayInfo(m_infoFilename[index], index);
@@ -1650,7 +1650,7 @@ void CRobotMain::StartDisplayInfo(int index, BOOL bMovie) void CRobotMain::StartDisplayInfo(char *filename, int index)
{
CButton* pb;
- BOOL bSoluce;
+ bool bSoluce;
if ( m_bCmdEdit ) return;
@@ -1659,10 +1659,10 @@ void CRobotMain::StartDisplayInfo(char *filename, int index) if ( !m_bEditLock )
{
-//? m_map->ShowMap(FALSE);
+//? m_map->ShowMap(false);
m_infoObject = DeselectAll(); // removes the control buttons
- m_displayText->HideText(TRUE);
- m_sound->MuteAll(TRUE);
+ m_displayText->HideText(true);
+ m_sound->MuteAll(true);
}
pb = (CButton*)m_interface->SearchControl(EVENT_BUTTON_QUIT);
@@ -1711,11 +1711,11 @@ void CRobotMain::StopDisplayInfo() pb->SetState(STATE_VISIBLE);
}
- SelectObject(m_infoObject, FALSE); // gives the command buttons
+ SelectObject(m_infoObject, false); // gives the command buttons
//? m_map->ShowMap(m_bMapShow);
- m_displayText->HideText(FALSE);
+ m_displayText->HideText(false);
- m_sound->MuteAll(FALSE);
+ m_sound->MuteAll(false);
}
if ( m_infoUsed == 0 )
@@ -1753,9 +1753,9 @@ void CRobotMain::StartSuspend() {
CButton* pb;
- m_map->ShowMap(FALSE);
+ m_map->ShowMap(false);
m_infoObject = DeselectAll(); // removes the control buttons
- m_displayText->HideText(TRUE);
+ m_displayText->HideText(true);
pb = (CButton*)m_interface->SearchControl(EVENT_BUTTON_QUIT);
if ( pb != 0 )
@@ -1763,7 +1763,7 @@ void CRobotMain::StartSuspend() pb->ClearState(STATE_VISIBLE);
}
- m_bSuspend = TRUE;
+ m_bSuspend = true;
}
// End of dialogue during the game,
@@ -1778,11 +1778,11 @@ void CRobotMain::StopSuspend() pb->SetState(STATE_VISIBLE);
}
- SelectObject(m_infoObject, FALSE); // gives the command buttons
+ SelectObject(m_infoObject, false); // gives the command buttons
m_map->ShowMap(m_bMapShow);
- m_displayText->HideText(FALSE);
+ m_displayText->HideText(false);
- m_bSuspend = FALSE;
+ m_bSuspend = false;
}
@@ -1837,13 +1837,13 @@ FPOINT CRobotMain::RetWindowDim() // Managing windows open/save.
-void CRobotMain::SetIOPublic(BOOL bMode)
+void CRobotMain::SetIOPublic(bool bMode)
{
m_IOPublic = bMode;
SetProfileInt("Edit", "IOPublic", m_IOPublic);
}
-BOOL CRobotMain::RetIOPublic()
+bool CRobotMain::RetIOPublic()
{
return m_IOPublic;
}
@@ -1956,7 +1956,7 @@ void CRobotMain::StartDisplayVisit(EventMsg event) m_visitArrow = 0;
}
goal = m_displayText->RetVisitGoal(event);
- m_visitArrow = CreateObject(goal, 0.0f, 1.0f, 10.0f, OBJECT_SHOW, FALSE, FALSE, 0);
+ m_visitArrow = CreateObject(goal, 0.0f, 1.0f, 10.0f, OBJECT_SHOW, false, false, 0);
m_visitPos = m_visitArrow->RetPosition(0);
m_visitPosArrow = m_visitPos;
@@ -1971,7 +1971,7 @@ void CRobotMain::StartDisplayVisit(EventMsg event) m_camera->StartVisit(m_displayText->RetVisitGoal(event),
m_displayText->RetVisitDist(event));
m_displayText->SetVisit(event);
- ChangePause(TRUE);
+ ChangePause(true);
}
// Move the arrow to visit.
@@ -2030,10 +2030,10 @@ void CRobotMain::StopDisplayVisit() m_camera->StopVisit();
m_displayText->ClearVisit();
- ChangePause(FALSE);
+ ChangePause(false);
if ( m_visitObject != 0 )
{
- SelectObject(m_visitObject, FALSE); // gives the command buttons
+ SelectObject(m_visitObject, false); // gives the command buttons
m_visitObject = 0;
}
}
@@ -2070,20 +2070,20 @@ CObject* CRobotMain::DeselectAll() if ( pObj == 0 ) break;
if ( pObj->RetSelect() ) pPrev = pObj;
- pObj->SetSelect(FALSE);
+ pObj->SetSelect(false);
}
return pPrev;
}
// Selects an object, without attending to deselect the rest.
-void CRobotMain::SelectOneObject(CObject* pObj, BOOL bDisplayError)
+void CRobotMain::SelectOneObject(CObject* pObj, bool bDisplayError)
{
ObjectType type;
CObject* toto;
CMotionToto* mt;
- pObj->SetSelect(TRUE, bDisplayError);
+ pObj->SetSelect(true, bDisplayError);
m_camera->SetObject(pObj);
type = pObj->RetType();
@@ -2137,7 +2137,7 @@ void CRobotMain::SelectOneObject(CObject* pObj, BOOL bDisplayError) // Selects the object aimed by the mouse.
-BOOL CRobotMain::SelectObject(CObject* pObj, BOOL bDisplayError)
+bool CRobotMain::SelectObject(CObject* pObj, bool bDisplayError)
{
CObject* pPrev;
@@ -2146,9 +2146,9 @@ BOOL CRobotMain::SelectObject(CObject* pObj, BOOL bDisplayError) StopDisplayVisit();
}
- if ( m_bMovieLock || m_bEditLock || m_bPause ) return FALSE;
- if ( m_movie->IsExist() ) return FALSE;
- if ( pObj == 0 || !IsSelectable(pObj) ) return FALSE;
+ if ( m_bMovieLock || m_bEditLock || m_bPause ) return false;
+ if ( m_movie->IsExist() ) return false;
+ if ( pObj == 0 || !IsSelectable(pObj) ) return false;
pPrev = DeselectAll();
@@ -2159,12 +2159,12 @@ BOOL CRobotMain::SelectObject(CObject* pObj, BOOL bDisplayError) SelectOneObject(pObj, bDisplayError);
m_short->UpdateShortcuts();
- return TRUE;
+ return true;
}
// Deselects the selected object.
-BOOL CRobotMain::DeselectObject()
+bool CRobotMain::DeselectObject()
{
CObject* pObj;
CObject* pPrev;
@@ -2194,7 +2194,7 @@ BOOL CRobotMain::DeselectObject() }
m_short->UpdateShortcuts();
- return TRUE;
+ return true;
}
// Quickly removes all objects.
@@ -2206,7 +2206,7 @@ void CRobotMain::DeleteAllObjects() int i;
// Removes all pyrotechnic effects in progress.
- while ( TRUE )
+ while ( true )
{
pyro = (CPyro*)m_iMan->SearchInstance(CLASS_PYRO, 0);
if ( pyro == 0 ) break;
@@ -2228,12 +2228,12 @@ void CRobotMain::DeleteAllObjects() FlushShowLimit(i);
}
- while ( TRUE )
+ while ( true )
{
pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, 0);
if ( pObj == 0 ) break;
- pObj->DeleteObject(TRUE); // destroys rapidly
+ pObj->DeleteObject(true); // destroys rapidly
delete pObj;
}
}
@@ -2515,11 +2515,11 @@ CObject* CRobotMain::DetectObject(FPOINT pos) // Indicates whether an object is selectable.
-BOOL CRobotMain::IsSelectable(CObject* pObj)
+bool CRobotMain::IsSelectable(CObject* pObj)
{
ObjectType type;
- if ( !pObj->RetSelectable() ) return FALSE;
+ if ( !pObj->RetSelectable() ) return false;
type = pObj->RetType();
if ( type == OBJECT_HUMAN ||
@@ -2569,7 +2569,7 @@ BOOL CRobotMain::IsSelectable(CObject* pObj) type == OBJECT_SAFE ||
type == OBJECT_HUSTON )
{
- return TRUE;
+ return true;
}
if ( m_bSelectInsect )
@@ -2581,33 +2581,33 @@ BOOL CRobotMain::IsSelectable(CObject* pObj) type == OBJECT_WORM ||
type == OBJECT_MOBILEtg )
{
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
// Deletes the selected object.
-BOOL CRobotMain::DeleteObject()
+bool CRobotMain::DeleteObject()
{
CObject* pObj;
CPyro* pyro;
pObj = RetSelect();
- if ( pObj == 0 ) return FALSE;
+ if ( pObj == 0 ) return false;
pyro = new CPyro(m_iMan);
pyro->Create(PT_FRAGT, pObj);
- pObj->SetSelect(FALSE); // deselects the object
+ pObj->SetSelect(false); // deselects the object
m_camera->SetType(CAMERA_EXPLO);
DeselectAll();
pObj->DeleteDeselList(pObj);
- return TRUE;
+ return true;
}
@@ -2631,12 +2631,12 @@ void CRobotMain::HiliteClear() pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i);
if ( pObj == 0 ) break;
- pObj->SetHilite(FALSE);
+ pObj->SetHilite(false);
m_map->SetHilite(0);
m_short->SetHilite(0);
}
- m_bHilite = FALSE;
+ m_bHilite = false;
}
// Highlights the object with the mouse hovers over.
@@ -2645,7 +2645,7 @@ void CRobotMain::HiliteObject(FPOINT pos) {
CObject* pObj;
char name[100];
- BOOL bInMap;
+ bool bInMap;
if ( m_bFixScene && m_phase != PHASE_PERSO ) return;
if ( m_bMovieLock ) return;
@@ -2694,10 +2694,10 @@ void CRobotMain::HiliteObject(FPOINT pos) if ( IsSelectable(pObj) )
{
- pObj->SetHilite(TRUE);
+ pObj->SetHilite(true);
m_map->SetHilite(pObj);
m_short->SetHilite(pObj);
- m_bHilite = TRUE;
+ m_bHilite = true;
}
}
}
@@ -2760,7 +2760,7 @@ void CRobotMain::CreateTooltip(FPOINT pos, char* text) if ( pw != 0 )
{
pw->SetState(STATE_SHADOW);
- pw->SetTrashEvent(FALSE);
+ pw->SetTrashEvent(false);
pos.y -= m_engine->RetText()->RetHeight(SMALLFONT, FONT_COLOBOT)/2.0f;
pw->CreateLabel(pos, dim, -1, EVENT_LABEL2, text);
@@ -2978,7 +2978,7 @@ void CRobotMain::AbortMovie() }
}
- m_engine->SetMouseHide(FALSE);
+ m_engine->SetMouseHide(false);
}
@@ -3022,7 +3022,7 @@ void CRobotMain::InitEye() // Advances the entire scene.
-BOOL CRobotMain::EventFrame(const Event &event)
+bool CRobotMain::EventFrame(const Event &event)
{
ObjectType type;
CObject *pObj, *toto;
@@ -3038,7 +3038,7 @@ BOOL CRobotMain::EventFrame(const Event &event) m_gameTime > 0.1f && m_phase == PHASE_SIMUL )
{
m_displayText->DisplayError(INFO_BEGINSATCOM, D3DVECTOR(0.0f,0.0f,0.0f));
- m_bBeginSatCom = TRUE; // message appears
+ m_bBeginSatCom = true; // message appears
}
m_water->EventProcess(event);
@@ -3210,7 +3210,7 @@ BOOL CRobotMain::EventFrame(const Event &event) if ( !m_bEditLock && m_checkEndTime+1.0f < m_time )
{
m_checkEndTime = m_time;
- CheckEndMission(TRUE);
+ CheckEndMission(true);
}
if ( m_winDelay > 0.0f && !m_bEditLock )
@@ -3264,14 +3264,14 @@ BOOL CRobotMain::EventFrame(const Event &event) // Makes the event for all robots.
-BOOL CRobotMain::EventObject(const Event &event)
+bool CRobotMain::EventObject(const Event &event)
{
CObject* pObj;
int i;
if ( m_bFreePhoto ) return S_OK;
- m_bResetCreate = FALSE;
+ m_bResetCreate = false;
for ( i=0 ; i<1000000 ; i++ )
{
@@ -3532,16 +3532,16 @@ void CRobotMain::ScenePerso() m_dialog->SetSceneName("perso");
m_dialog->SetSceneRank(0);
- CreateScene(FALSE, TRUE, FALSE); // sets scene
+ CreateScene(false, true, false); // sets scene
- m_engine->SetDrawWorld(FALSE); // does not draw anything on the interface
- m_engine->SetDrawFront(TRUE); // draws on the human interface
+ m_engine->SetDrawWorld(false); // does not draw anything on the interface
+ m_engine->SetDrawFront(true); // draws on the human interface
pObj = SearchHuman();
if ( pObj != 0 )
{
CMotionHuman* mh;
- pObj->SetDrawFront(TRUE); // draws the interface
+ pObj->SetDrawFront(true); // draws the interface
mh = (CMotionHuman*)pObj->RetMotion();
if ( mh != 0 )
@@ -3553,7 +3553,7 @@ void CRobotMain::ScenePerso() // Creates the whole stage.
-void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject)
+void CRobotMain::CreateScene(bool bSoluce, bool bFixScene, bool bResetObject)
{
CObject* pObj;
CObject* pSel;
@@ -3581,7 +3581,7 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) m_bFixScene = bFixScene;
g_id = 0;
- m_bBase = FALSE;
+ m_bBase = false;
if ( !bResetObject )
{
@@ -3592,10 +3592,10 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) FlushDisplayInfo();
m_terrain->LevelFlush();
m_audioTrack = 0;
- m_bAudioRepeat = TRUE;
+ m_bAudioRepeat = true;
m_displayText->SetDelay(1.0f);
- m_displayText->SetEnable(TRUE);
- m_bImmediatSatCom = FALSE;
+ m_displayText->SetEnable(true);
+ m_bImmediatSatCom = false;
m_endingWinRank = 0;
m_endingLostRank = 0;
m_endTakeTotal = 0;
@@ -3604,8 +3604,8 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) m_endTakeLostDelay = 2.0f;
m_obligatoryTotal = 0;
m_prohibitedTotal = 0;
- m_bMapShow = TRUE;
- m_bMapImage = FALSE;
+ m_bMapShow = true;
+ m_bMapImage = false;
m_mapFilename[0] = 0;
m_colorRefBot.r = 10.0f/256.0f;
@@ -3763,8 +3763,8 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) if ( Cmd(line, "DeepView") && !bResetObject )
{
- m_engine->SetDeepView(OpFloat(line, "air", 500.0f)*UNIT, 0, TRUE);
- m_engine->SetDeepView(OpFloat(line, "water", 100.0f)*UNIT, 1, TRUE);
+ m_engine->SetDeepView(OpFloat(line, "air", 500.0f)*UNIT, 0, true);
+ m_engine->SetDeepView(OpFloat(line, "water", 100.0f)*UNIT, 1, true);
}
if ( Cmd(line, "FogStart") && !bResetObject )
@@ -3955,7 +3955,7 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) op = SearchOp(line, "id");
i = 0;
- while ( TRUE )
+ while ( true )
{
id[i] = GetInt(op, i, 0);
if ( id[i++] == 0 ) break;
@@ -3972,13 +3972,13 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) if ( Cmd(line, "TerrainCreate") && !bResetObject )
{
- m_terrain->CreateObjects(TRUE);
+ m_terrain->CreateObjects(true);
}
if ( Cmd(line, "BeginObject") )
{
InitEye();
- SetMovieLock(FALSE);
+ SetMovieLock(false);
if ( !m_bFixScene )
{
//? CreateObject(D3DVECTOR(0.0f, 0.0f, 0.0f), 0.0f, 0.0f, OBJECT_TOTO);
@@ -4057,7 +4057,7 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) {
pObj->SetDefRank(rankObj);
- if ( type == OBJECT_BASE ) m_bBase = TRUE;
+ if ( type == OBJECT_BASE ) m_bBase = true;
cType = OpCamera(line, "camera");
if ( cType != CAMERA_NULL )
@@ -4436,7 +4436,7 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) if ( !bResetObject )
{
ChangeColor(); // changes the colors of texture
- m_short->SetMode(FALSE); // vehicles?
+ m_short->SetMode(false); // vehicles?
}
CreateShortcuts();
@@ -4483,7 +4483,7 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) SelectObject(pSel);
m_camera->SetObject(pSel);
- m_bBeginSatCom = TRUE; // message already displayed
+ m_bBeginSatCom = true; // message already displayed
}
m_dialog->SetSceneRead("");
m_dialog->SetStackRead("");
@@ -4493,7 +4493,7 @@ void CRobotMain::CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject) CObject* CRobotMain::CreateObject(D3DVECTOR pos, float angle, float zoom, float height,
ObjectType type, float power,
- BOOL bTrainer, BOOL bToy,
+ bool bTrainer, bool bToy,
int option)
{
CObject* pObject = 0;
@@ -4504,7 +4504,7 @@ CObject* CRobotMain::CreateObject(D3DVECTOR pos, float angle, float zoom, float if ( type == OBJECT_HUMAN ||
type == OBJECT_TECH )
{
- bTrainer = FALSE; // necessarily
+ bTrainer = false; // necessarily
}
if ( type == OBJECT_PORTICO ||
@@ -5022,19 +5022,19 @@ void CRobotMain::ChangeColor() colorNew2.g = 0.0f;
colorNew2.b = 0.0f;
- m_engine->ChangeColor("base1.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, TRUE);
- m_engine->ChangeColor("convert.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, TRUE);
- m_engine->ChangeColor("derrick.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, TRUE);
- m_engine->ChangeColor("factory.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, TRUE);
- m_engine->ChangeColor("lemt.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, TRUE);
- m_engine->ChangeColor("roller.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, TRUE);
- m_engine->ChangeColor("search.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, TRUE);
+ m_engine->ChangeColor("base1.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, true);
+ m_engine->ChangeColor("convert.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, true);
+ m_engine->ChangeColor("derrick.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, true);
+ m_engine->ChangeColor("factory.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, true);
+ m_engine->ChangeColor("lemt.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, true);
+ m_engine->ChangeColor("roller.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, true);
+ m_engine->ChangeColor("search.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, 0, 0, true);
exclu[0] = FPOINT( 0.0f/256.0f, 160.0f/256.0f);
exclu[1] = FPOINT(256.0f/256.0f, 256.0f/256.0f); // pencils
exclu[2] = FPOINT(0.0f, 0.0f);
exclu[3] = FPOINT(0.0f, 0.0f); // terminator
- m_engine->ChangeColor("drawer.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, exclu, 0, TRUE);
+ m_engine->ChangeColor("drawer.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, exclu, 0, true);
exclu[0] = FPOINT(237.0f/256.0f, 176.0f/256.0f);
exclu[1] = FPOINT(256.0f/256.0f, 220.0f/256.0f); // blue canister
@@ -5042,7 +5042,7 @@ void CRobotMain::ChangeColor() exclu[3] = FPOINT(130.0f/256.0f, 214.0f/256.0f); // safe location
exclu[4] = FPOINT(0.0f, 0.0f);
exclu[5] = FPOINT(0.0f, 0.0f); // terminator
- m_engine->ChangeColor("subm.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, exclu, 0, TRUE);
+ m_engine->ChangeColor("subm.tga", m_colorRefBot, m_colorNewBot, colorRef2, colorNew2, 0.10f, -1.0f, ts, ti, exclu, 0, true);
exclu[0] = FPOINT(128.0f/256.0f, 160.0f/256.0f);
exclu[1] = FPOINT(256.0f/256.0f, 256.0f/256.0f); // SatCom
@@ -5056,17 +5056,17 @@ void CRobotMain::ChangeColor() // PARTIPLOUF0 and PARTIDROP :
ts = FPOINT(0.500f, 0.500f);
ti = FPOINT(0.875f, 0.750f);
- m_engine->ChangeColor("effect00.tga", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, TRUE);
+ m_engine->ChangeColor("effect00.tga", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true);
// PARTIFLIC :
ts = FPOINT(0.00f, 0.75f);
ti = FPOINT(0.25f, 1.00f);
- m_engine->ChangeColor("effect02.tga", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, TRUE);
+ m_engine->ChangeColor("effect02.tga", m_colorRefWater, m_colorNewWater, colorRef2, colorNew2, 0.20f, -1.0f, ts, ti, 0, m_colorShiftWater, true);
}
// Updates the number of unnecessary objects.
-BOOL CRobotMain::TestGadgetQuantity(int rank)
+bool CRobotMain::TestGadgetQuantity(int rank)
{
float percent;
int *table;
@@ -5082,8 +5082,8 @@ BOOL CRobotMain::TestGadgetQuantity(int rank) static int table90[10] = {0,1,1,1,1,1,1,1,1,1};
percent = m_engine->RetGadgetQuantity();
- if ( percent == 0.0f ) return FALSE;
- if ( percent == 1.0f ) return TRUE;
+ if ( percent == 0.0f ) return false;
+ if ( percent == 1.0f ) return true;
if ( percent <= 0.15f ) table = table10;
else if ( percent <= 0.25f ) table = table20;
@@ -5158,7 +5158,7 @@ float CRobotMain::SearchNearestObject(D3DVECTOR center, CObject *exclu) // Calculates a free space.
-BOOL CRobotMain::FreeSpace(D3DVECTOR ¢er, float minRadius, float maxRadius,
+bool CRobotMain::FreeSpace(D3DVECTOR ¢er, float minRadius, float maxRadius,
float space, CObject *exclu)
{
D3DVECTOR pos;
@@ -5178,7 +5178,7 @@ BOOL CRobotMain::FreeSpace(D3DVECTOR ¢er, float minRadius, float maxRadius, pos.x = p.x;
pos.z = p.y;
pos.y = 0.0f;
- m_terrain->MoveOnFloor(pos, TRUE);
+ m_terrain->MoveOnFloor(pos, true);
dist = SearchNearestObject(pos, exclu);
if ( dist >= space )
{
@@ -5186,7 +5186,7 @@ BOOL CRobotMain::FreeSpace(D3DVECTOR ¢er, float minRadius, float maxRadius, if ( flat >= dist/2.0f )
{
center = pos;
- return TRUE;
+ return true;
}
}
}
@@ -5205,7 +5205,7 @@ BOOL CRobotMain::FreeSpace(D3DVECTOR ¢er, float minRadius, float maxRadius, pos.x = p.x;
pos.z = p.y;
pos.y = 0.0f;
- m_terrain->MoveOnFloor(pos, TRUE);
+ m_terrain->MoveOnFloor(pos, true);
dist = SearchNearestObject(pos, exclu);
if ( dist >= space )
{
@@ -5213,13 +5213,13 @@ BOOL CRobotMain::FreeSpace(D3DVECTOR ¢er, float minRadius, float maxRadius, if ( flat >= dist/2.0f )
{
center = pos;
- return TRUE;
+ return true;
}
}
}
}
}
- return FALSE;
+ return false;
}
// Calculates the maximum radius of a free space.
@@ -5365,7 +5365,7 @@ void CRobotMain::FlushShowLimit(int i) m_showLimit[i].total = 0;
m_showLimit[i].link = 0;
- m_showLimit[i].bUsed = FALSE;
+ m_showLimit[i].bUsed = false;
}
// Specifies the boundaries to show.
@@ -5392,7 +5392,7 @@ void CRobotMain::SetShowLimit(int i, ParticuleType parti, CObject *pObj, dist = 10.0f;
}
- m_showLimit[i].bUsed = TRUE;
+ m_showLimit[i].bUsed = true;
m_showLimit[i].link = pObj;
m_showLimit[i].pos = pos;
m_showLimit[i].radius = radius;
@@ -5479,7 +5479,7 @@ void CRobotMain::FrameShowLimit(float rTime) pos.x = rotate.x;
pos.z = rotate.y;
pos.y = 0.0f;
- m_terrain->MoveOnFloor(pos, TRUE);
+ m_terrain->MoveOnFloor(pos, true);
if ( m_showLimit[i].radius <= 50.0f ) pos.y += 0.5f;
else pos.y += 2.0f;
m_particule->SetPosition(m_showLimit[i].parti[j], pos);
@@ -5511,7 +5511,7 @@ char* SearchLastDir(char *filename) // Compiles all scripts of robots.
-void CRobotMain::CompileScript(BOOL bSoluce)
+void CRobotMain::CompileScript(bool bSoluce)
{
CObject* pObj;
CBrain* brain;
@@ -5746,36 +5746,36 @@ void CRobotMain::SaveFileScript(CObject *pObj, char* filename, int objRank) // Saves the stack of the program in execution of a robot.
-BOOL CRobotMain::SaveFileStack(CObject *pObj, FILE *file, int objRank)
+bool CRobotMain::SaveFileStack(CObject *pObj, FILE *file, int objRank)
{
ObjectType type;
CBrain* brain;
- if ( objRank == -1 ) return TRUE;
+ if ( objRank == -1 ) return true;
brain = pObj->RetBrain();
- if ( brain == 0 ) return TRUE;
+ if ( brain == 0 ) return true;
type = pObj->RetType();
- if ( type == OBJECT_HUMAN ) return TRUE;
+ if ( type == OBJECT_HUMAN ) return true;
return brain->WriteStack(file);
}
// Resumes the execution stack of the program in a robot.
-BOOL CRobotMain::ReadFileStack(CObject *pObj, FILE *file, int objRank)
+bool CRobotMain::ReadFileStack(CObject *pObj, FILE *file, int objRank)
{
ObjectType type;
CBrain* brain;
- if ( objRank == -1 ) return TRUE;
+ if ( objRank == -1 ) return true;
brain = pObj->RetBrain();
- if ( brain == 0 ) return TRUE;
+ if ( brain == 0 ) return true;
type = pObj->RetType();
- if ( type == OBJECT_HUMAN ) return TRUE;
+ if ( type == OBJECT_HUMAN ) return true;
return brain->ReadStack(file);
}
@@ -5783,20 +5783,20 @@ BOOL CRobotMain::ReadFileStack(CObject *pObj, FILE *file, int objRank) // Empty the list.
-BOOL CRobotMain::FlushNewScriptName()
+bool CRobotMain::FlushNewScriptName()
{
int i;
for ( i=0 ; i<MAXNEWSCRIPTNAME ; i++ )
{
- m_newScriptName[i].bUsed = FALSE;
+ m_newScriptName[i].bUsed = false;
}
- return TRUE;
+ return true;
}
// Adds a script name.
-BOOL CRobotMain::AddNewScriptName(ObjectType type, char *name)
+bool CRobotMain::AddNewScriptName(ObjectType type, char *name)
{
int i;
@@ -5804,13 +5804,13 @@ BOOL CRobotMain::AddNewScriptName(ObjectType type, char *name) {
if ( !m_newScriptName[i].bUsed )
{
- m_newScriptName[i].bUsed = TRUE;
+ m_newScriptName[i].bUsed = true;
m_newScriptName[i].type = type;
strcpy(m_newScriptName[i].name, name);
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
// Seeks a script name for a given type.
@@ -5836,14 +5836,14 @@ char* CRobotMain::RetNewScriptName(ObjectType type, int rank) // Seeks if an object occupies in a spot, to prevent a backup of the game.
-BOOL CRobotMain::IsBusy()
+bool CRobotMain::IsBusy()
{
CObject* pObj;
CBrain* pBrain;
//? CAuto* pAuto;
int i;
- if ( m_CompteurFileOpen > 0 ) return TRUE;
+ if ( m_CompteurFileOpen > 0 ) return true;
for ( i=0 ; i<1000000 ; i++ )
{
@@ -5853,16 +5853,16 @@ BOOL CRobotMain::IsBusy() pBrain = pObj->RetBrain();
if ( pBrain != 0 )
{
- if ( pBrain->IsBusy() ) return TRUE;
+ if ( pBrain->IsBusy() ) return true;
}
//? pAuto = pObj->RetAuto();
//? if ( pAuto != 0 )
//? {
-//? if ( pAuto->RetBusy() ) return TRUE;
+//? if ( pAuto->RetBusy() ) return true;
//? }
}
- return FALSE;
+ return false;
}
// Writes an object into the backup file.
@@ -5962,7 +5962,7 @@ void CRobotMain::IOWriteObject(FILE *file, CObject* pObj, char *cmd) // Saves the current game.
-BOOL CRobotMain::IOWriteScene(char *filename, char *filecbot, char *info)
+bool CRobotMain::IOWriteScene(char *filename, char *filecbot, char *info)
{
FILE* file;
char line[500];
@@ -5973,7 +5973,7 @@ BOOL CRobotMain::IOWriteScene(char *filename, char *filecbot, char *info) long version;
file = fopen(filename, "w");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
sprintf(line, "Title text=\"%s\"\n", info);
fputs(line, file);
@@ -6039,7 +6039,7 @@ BOOL CRobotMain::IOWriteScene(char *filename, char *filecbot, char *info) #if CBOT_STACK
// Writes the file of stacks of execution.
file = fOpen(filecbot, "wb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
version = 1;
fWrite(&version, sizeof(long), 1, file); // version of COLOBOT
@@ -6065,7 +6065,7 @@ BOOL CRobotMain::IOWriteScene(char *filename, char *filecbot, char *info) #endif
m_delayWriteMessage = 4; // displays message in 3 frames
- return TRUE;
+ return true;
}
// Resumes the game.
@@ -6127,7 +6127,7 @@ CObject* CRobotMain::IOReadObject(char *line, char* filename, int objRank) }
}
- if ( type == OBJECT_BASE ) m_bBase = TRUE;
+ if ( type == OBJECT_BASE ) m_bBase = true;
pObj->Read(line);
@@ -6169,7 +6169,7 @@ CObject* CRobotMain::IOReadScene(char *filename, char *filecbot) int i, objRank, nbError, lastError;
long version;
- m_bBase = FALSE;
+ m_bBase = false;
file = fopen(filename, "r");
if ( file == NULL ) return 0;
@@ -6369,7 +6369,7 @@ void CRobotMain::ResetObject() int i;
// Removes all pyrotechnic effects in progress.
- while ( TRUE )
+ while ( true )
{
pyro = (CPyro*)m_iMan->SearchInstance(CLASS_PYRO, 0);
if ( pyro == 0 ) break;
@@ -6427,7 +6427,7 @@ void CRobotMain::ResetObject() }
}
- pObj->SetEnable(TRUE); // active again
+ pObj->SetEnable(true); // active again
pos = pObj->RetResetPosition();
angle = pObj->RetResetAngle();
@@ -6445,7 +6445,7 @@ void CRobotMain::ResetObject() }
}
#else
- m_bResetCreate = TRUE;
+ m_bResetCreate = true;
#endif
}
@@ -6477,7 +6477,7 @@ void CRobotMain::ResetCreate() m_iMan->Flush(CLASS_PYRO);
m_camera->SetType(CAMERA_DIALOG);
- CreateScene(m_dialog->RetSceneSoluce(), FALSE, TRUE);
+ CreateScene(m_dialog->RetSceneSoluce(), false, true);
if ( !RetNiceReset() ) return;
@@ -6496,7 +6496,7 @@ void CRobotMain::ResetCreate() // Checks if the mission is over.
-Error CRobotMain::CheckEndMission(BOOL bFrame)
+Error CRobotMain::CheckEndMission(bool bFrame)
{
CObject* pObj;
D3DVECTOR bPos, oPos;
@@ -6556,7 +6556,7 @@ Error CRobotMain::CheckEndMission(BOOL bFrame) m_lostDelay = 0.1f; // lost immediately
m_winDelay = 0.0f;
}
- m_displayText->SetEnable(FALSE);
+ m_displayText->SetEnable(false);
return INFO_LOSTq;
}
else
@@ -6567,14 +6567,14 @@ Error CRobotMain::CheckEndMission(BOOL bFrame) m_lostDelay = m_endTakeLostDelay; // lost in 6 seconds
m_winDelay = 0.0f;
}
- m_displayText->SetEnable(FALSE);
+ m_displayText->SetEnable(false);
return INFO_LOST;
}
}
if ( nb < m_endTake[t].min ||
nb > m_endTake[t].max )
{
- m_displayText->SetEnable(TRUE);
+ m_displayText->SetEnable(true);
return ERR_MISSION_NOTERM;
}
if ( m_endTake[t].bImmediat )
@@ -6584,7 +6584,7 @@ Error CRobotMain::CheckEndMission(BOOL bFrame) m_winDelay = m_endTakeWinDelay; // wins in x seconds
m_lostDelay = 0.0f;
}
- m_displayText->SetEnable(FALSE);
+ m_displayText->SetEnable(false);
return ERR_OK; // mission ended
}
}
@@ -6593,7 +6593,7 @@ Error CRobotMain::CheckEndMission(BOOL bFrame) {
if ( m_endTakeResearch != (m_endTakeResearch&g_researchDone) )
{
- m_displayText->SetEnable(TRUE);
+ m_displayText->SetEnable(true);
return ERR_MISSION_NOTERM;
}
}
@@ -6602,7 +6602,7 @@ Error CRobotMain::CheckEndMission(BOOL bFrame) {
m_winDelay = 1.0f; // wins in one second
m_lostDelay = 0.0f;
- m_displayText->SetEnable(FALSE);
+ m_displayText->SetEnable(false);
return ERR_OK; // mission ended
}
@@ -6614,7 +6614,7 @@ Error CRobotMain::CheckEndMission(BOOL bFrame) m_winDelay = m_endTakeWinDelay; // wins in two seconds
m_lostDelay = 0.0f;
}
- m_displayText->SetEnable(FALSE);
+ m_displayText->SetEnable(false);
return ERR_OK; // mission ended
}
@@ -6670,7 +6670,7 @@ int CRobotMain::IsObligatoryToken(char *token) // Checks if an instruction is not part of the banned list.
-BOOL CRobotMain::IsProhibitedToken(char *token)
+bool CRobotMain::IsProhibitedToken(char *token)
{
int i;
@@ -6678,23 +6678,23 @@ BOOL CRobotMain::IsProhibitedToken(char *token) {
if ( strcmp(token, m_prohibitedToken[i]) == 0 )
{
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
// Indicates whether it is possible to control a driving robot.
-BOOL CRobotMain::RetTrainerPilot()
+bool CRobotMain::RetTrainerPilot()
{
return m_bTrainerPilot;
}
// Indicates whether the scene is fixed, without interaction.
-BOOL CRobotMain::RetFixScene()
+bool CRobotMain::RetFixScene()
{
return m_bFixScene;
}
@@ -6721,48 +6721,48 @@ char* CRobotMain::RetScriptFile() }
-BOOL CRobotMain::RetGlint()
+bool CRobotMain::RetGlint()
{
return m_dialog->RetGlint();
}
-BOOL CRobotMain::RetSoluce4()
+bool CRobotMain::RetSoluce4()
{
return m_dialog->RetSoluce4();
}
-BOOL CRobotMain::RetMovies()
+bool CRobotMain::RetMovies()
{
return m_dialog->RetMovies();
}
-BOOL CRobotMain::RetNiceReset()
+bool CRobotMain::RetNiceReset()
{
return m_dialog->RetNiceReset();
}
-BOOL CRobotMain::RetHimselfDamage()
+bool CRobotMain::RetHimselfDamage()
{
return m_dialog->RetHimselfDamage();
}
-BOOL CRobotMain::RetShowSoluce()
+bool CRobotMain::RetShowSoluce()
{
return m_bShowSoluce;
}
-BOOL CRobotMain::RetSceneSoluce()
+bool CRobotMain::RetSceneSoluce()
{
- if ( m_infoFilename[SATCOM_SOLUCE][0] == 0 ) return FALSE;
+ if ( m_infoFilename[SATCOM_SOLUCE][0] == 0 ) return false;
return m_dialog->RetSceneSoluce();
}
-BOOL CRobotMain::RetShowAll()
+bool CRobotMain::RetShowAll()
{
return m_bShowAll;
}
-BOOL CRobotMain::RetCheatRadar()
+bool CRobotMain::RetCheatRadar()
{
return m_bCheatRadar;
}
@@ -6816,7 +6816,7 @@ int CRobotMain::RetGamerGlasses() // Returns the mode with just the head.
-BOOL CRobotMain::RetGamerOnlyHead()
+bool CRobotMain::RetGamerOnlyHead()
{
return m_dialog->RetGamerOnlyHead();
}
@@ -6831,7 +6831,7 @@ float CRobotMain::RetPersoAngle() // Changes on the pause mode.
-void CRobotMain::ChangePause(BOOL bPause)
+void CRobotMain::ChangePause(bool bPause)
{
m_bPause = bPause;
m_engine->SetPause(m_bPause);
@@ -6875,10 +6875,10 @@ float CRobotMain::RetSpeed() // Creates interface shortcuts to the units.
-BOOL CRobotMain::CreateShortcuts()
+bool CRobotMain::CreateShortcuts()
{
- if ( m_phase != PHASE_SIMUL ) return FALSE;
- if ( !m_bShortCut ) return FALSE;
+ if ( m_phase != PHASE_SIMUL ) return false;
+ if ( !m_bShortCut ) return false;
return m_short->CreateShortcuts();
}
@@ -6891,7 +6891,7 @@ void CRobotMain::UpdateMap() // Indicates whether the mini-map is visible.
-BOOL CRobotMain::RetShowMap()
+bool CRobotMain::RetShowMap()
{
return m_map->RetShowMap() && m_bMapShow;
}
@@ -6899,7 +6899,7 @@ BOOL CRobotMain::RetShowMap() // Management of the lock mode for movies.
-void CRobotMain::SetMovieLock(BOOL bLock)
+void CRobotMain::SetMovieLock(bool bLock)
{
m_bMovieLock = bLock;
m_engine->SetMovieLock(m_bMovieLock);
@@ -6910,31 +6910,31 @@ void CRobotMain::SetMovieLock(BOOL bLock) m_engine->SetMouseHide(m_bMovieLock);
}
-BOOL CRobotMain::RetMovieLock()
+bool CRobotMain::RetMovieLock()
{
return m_bMovieLock;
}
-BOOL CRobotMain::RetInfoLock()
+bool CRobotMain::RetInfoLock()
{
return ( m_displayInfo != 0 ); // info in progress?
}
// Management of the blocking of the call of SatCom.
-void CRobotMain::SetSatComLock(BOOL bLock)
+void CRobotMain::SetSatComLock(bool bLock)
{
m_bSatComLock = bLock;
}
-BOOL CRobotMain::RetSatComLock()
+bool CRobotMain::RetSatComLock()
{
return m_bSatComLock;
}
// Management of the lock mode for the edition.
-void CRobotMain::SetEditLock(BOOL bLock, BOOL bEdit)
+void CRobotMain::SetEditLock(bool bLock, bool bEdit)
{
m_bEditLock = bLock;
@@ -6955,29 +6955,29 @@ void CRobotMain::SetEditLock(BOOL bLock, BOOL bEdit) }
else
{
- m_bEditFull = FALSE;
+ m_bEditFull = false;
}
}
-BOOL CRobotMain::RetEditLock()
+bool CRobotMain::RetEditLock()
{
return m_bEditLock;
}
// Management of the fullscreen mode during editing.
-void CRobotMain::SetEditFull(BOOL bFull)
+void CRobotMain::SetEditFull(bool bFull)
{
m_bEditFull = bFull;
}
-BOOL CRobotMain::RetEditFull()
+bool CRobotMain::RetEditFull()
{
return m_bEditFull;
}
-BOOL CRobotMain::RetFreePhoto()
+bool CRobotMain::RetFreePhoto()
{
return m_bFreePhoto;
}
@@ -6985,12 +6985,12 @@ BOOL CRobotMain::RetFreePhoto() // Indicates whether mouse is on an friend object, on which we should not shoot.
-void CRobotMain::SetFriendAim(BOOL bFriend)
+void CRobotMain::SetFriendAim(bool bFriend)
{
m_bFriendAim = bFriend;
}
-BOOL CRobotMain::RetFriendAim()
+bool CRobotMain::RetFriendAim()
{
return m_bFriendAim;
}
diff --git a/src/object/robotmain.h b/src/object/robotmain.h index 6175a7d..893bd50 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -95,7 +95,7 @@ typedef struct int min; // wins if>
int max; // wins if <
int lost; // lost if <=
- BOOL bImmediat;
+ bool bImmediat;
char message[100];
}
EndTake;
@@ -105,7 +105,7 @@ EndTake; typedef struct
{
- BOOL bUsed;
+ bool bUsed;
ObjectType type;
char name[40];
}
@@ -118,7 +118,7 @@ NewScriptName; typedef struct
{
- BOOL bUsed;
+ bool bUsed;
D3DVECTOR pos;
float radius;
int total;
@@ -149,28 +149,28 @@ public: void CreateIni();
void ChangePhase(Phase phase);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
- BOOL CreateShortcuts();
+ bool CreateShortcuts();
void ScenePerso();
- void SetMovieLock(BOOL bLock);
- BOOL RetMovieLock();
- BOOL RetInfoLock();
- void SetSatComLock(BOOL bLock);
- BOOL RetSatComLock();
- void SetEditLock(BOOL bLock, BOOL bEdit);
- BOOL RetEditLock();
- void SetEditFull(BOOL bFull);
- BOOL RetEditFull();
- BOOL RetFreePhoto();
- void SetFriendAim(BOOL bFriend);
- BOOL RetFriendAim();
+ void SetMovieLock(bool bLock);
+ bool RetMovieLock();
+ bool RetInfoLock();
+ void SetSatComLock(bool bLock);
+ bool RetSatComLock();
+ void SetEditLock(bool bLock, bool bEdit);
+ bool RetEditLock();
+ void SetEditFull(bool bFull);
+ bool RetEditFull();
+ bool RetFreePhoto();
+ void SetFriendAim(bool bFriend);
+ bool RetFriendAim();
void SetTracePrecision(float factor);
float RetTracePrecision();
- void ChangePause(BOOL bPause);
+ void ChangePause(bool bPause);
void SetSpeed(float speed);
float RetSpeed();
@@ -180,26 +180,26 @@ public: CObject* SearchHuman();
CObject* SearchToto();
CObject* SearchNearest(D3DVECTOR pos, CObject* pExclu);
- BOOL SelectObject(CObject* pObj, BOOL bDisplayError=TRUE);
+ bool SelectObject(CObject* pObj, bool bDisplayError=true);
CObject* RetSelectObject();
CObject* DeselectAll();
- BOOL DeleteObject();
+ bool DeleteObject();
void ResetObject();
void ResetCreate();
- Error CheckEndMission(BOOL bFrame);
+ Error CheckEndMission(bool bFrame);
void CheckEndMessage(char *message);
int RetObligatoryToken();
char* RetObligatoryToken(int i);
int IsObligatoryToken(char *token);
- BOOL IsProhibitedToken(char *token);
+ bool IsProhibitedToken(char *token);
void UpdateMap();
- BOOL RetShowMap();
+ bool RetShowMap();
MainMovieType RetMainMovie();
void FlushDisplayInfo();
- void StartDisplayInfo(int index, BOOL bMovie);
+ void StartDisplayInfo(int index, bool bMovie);
void StartDisplayInfo(char *filename, int index);
void StopDisplayInfo();
char* RetDisplayInfoName(int index);
@@ -218,8 +218,8 @@ public: void SetWindowDim(FPOINT dim);
FPOINT RetWindowDim();
- void SetIOPublic(BOOL bMode);
- BOOL RetIOPublic();
+ void SetIOPublic(bool bMode);
+ bool RetIOPublic();
void SetIOPos(FPOINT pos);
FPOINT RetIOPos();
void SetIODim(FPOINT dim);
@@ -229,17 +229,17 @@ public: char* RetResume();
char* RetScriptName();
char* RetScriptFile();
- BOOL RetTrainerPilot();
- BOOL RetFixScene();
- BOOL RetGlint();
- BOOL RetSoluce4();
- BOOL RetMovies();
- BOOL RetNiceReset();
- BOOL RetHimselfDamage();
- BOOL RetShowSoluce();
- BOOL RetSceneSoluce();
- BOOL RetShowAll();
- BOOL RetCheatRadar();
+ bool RetTrainerPilot();
+ bool RetFixScene();
+ bool RetGlint();
+ bool RetSoluce4();
+ bool RetMovies();
+ bool RetNiceReset();
+ bool RetHimselfDamage();
+ bool RetShowSoluce();
+ bool RetSceneSoluce();
+ bool RetShowAll();
+ bool RetCheatRadar();
char* RetSavegameDir();
char* RetPublicDir();
char* RetFilesDir();
@@ -248,7 +248,7 @@ public: char* RetGamerName();
int RetGamerFace();
int RetGamerGlasses();
- BOOL RetGamerOnlyHead();
+ bool RetGamerOnlyHead();
float RetPersoAngle();
void StartMusic();
@@ -256,7 +256,7 @@ public: void ChangeColor();
float SearchNearestObject(D3DVECTOR center, CObject *exclu);
- BOOL FreeSpace(D3DVECTOR ¢er, float minRadius, float maxRadius, float space, CObject *exclu);
+ bool FreeSpace(D3DVECTOR ¢er, float minRadius, float maxRadius, float space, CObject *exclu);
float RetFlatZoneRadius(D3DVECTOR center, float maxRadius, CObject *exclu);
void HideDropZone(CObject* metal);
void ShowDropZone(CObject* metal, CObject* truck);
@@ -266,24 +266,24 @@ public: void StartShowLimit();
void FrameShowLimit(float rTime);
- void CompileScript(BOOL bSoluce);
+ void CompileScript(bool bSoluce);
void LoadOneScript(CObject *pObj, int &nbError);
void LoadFileScript(CObject *pObj, char* filename, int objRank, int &nbError);
void SaveAllScript();
void SaveOneScript(CObject *pObj);
void SaveFileScript(CObject *pObj, char* filename, int objRank);
- BOOL SaveFileStack(CObject *pObj, FILE *file, int objRank);
- BOOL ReadFileStack(CObject *pObj, FILE *file, int objRank);
+ bool SaveFileStack(CObject *pObj, FILE *file, int objRank);
+ bool ReadFileStack(CObject *pObj, FILE *file, int objRank);
- BOOL FlushNewScriptName();
- BOOL AddNewScriptName(ObjectType type, char *name);
+ bool FlushNewScriptName();
+ bool AddNewScriptName(ObjectType type, char *name);
char* RetNewScriptName(ObjectType type, int rank);
void WriteFreeParam();
void ReadFreeParam();
- BOOL IsBusy();
- BOOL IOWriteScene(char *filename, char *filecbot, char *info);
+ bool IsBusy();
+ bool IOWriteScene(char *filename, char *filecbot, char *info);
CObject* IOReadScene(char *filename, char *filecbot);
void IOWriteObject(FILE *file, CObject* pObj, char *cmd);
CObject* IOReadObject(char *line, char* filename, int objRank);
@@ -291,16 +291,16 @@ public: int CreateSpot(D3DVECTOR pos, D3DCOLORVALUE color);
protected:
- BOOL EventFrame(const Event &event);
- BOOL EventObject(const Event &event);
+ bool EventFrame(const Event &event);
+ bool EventObject(const Event &event);
void InitEye();
void Convert();
- void CreateScene(BOOL bSoluce, BOOL bFixScene, BOOL bResetObject);
+ void CreateScene(bool bSoluce, bool bFixScene, bool bResetObject);
void CreateModel();
D3DVECTOR LookatPoint( D3DVECTOR eye, float angleH, float angleV, float length );
- CObject* CreateObject(D3DVECTOR pos, float angle, float zoom, float height, ObjectType type, float power=1.0f, BOOL bTrainer=FALSE, BOOL bToy=FALSE, int option=0);
+ CObject* CreateObject(D3DVECTOR pos, float angle, float zoom, float height, ObjectType type, float power=1.0f, bool bTrainer=false, bool bToy=false, int option=0);
int CreateLight(D3DVECTOR direction, D3DCOLORVALUE color);
void HiliteClear();
void HiliteObject(FPOINT pos);
@@ -312,10 +312,10 @@ protected: void RemoteCamera(float pan, float zoom, float rTime);
void KeyCamera(EventMsg event, long param);
void AbortMovie();
- BOOL IsSelectable(CObject* pObj);
- void SelectOneObject(CObject* pObj, BOOL bDisplayError=TRUE);
+ bool IsSelectable(CObject* pObj);
+ void SelectOneObject(CObject* pObj, bool bDisplayError=true);
void HelpObject();
- BOOL DeselectObject();
+ bool DeselectObject();
void DeleteAllObjects();
void UpdateInfoText();
CObject* SearchObject(ObjectType type);
@@ -324,7 +324,7 @@ protected: void FrameVisit(float rTime);
void StopDisplayVisit();
void ExecuteCmd(char *cmd);
- BOOL TestGadgetQuantity(int rank);
+ bool TestGadgetQuantity(int rank);
protected:
CInstanceManager* m_iMan;
@@ -353,41 +353,41 @@ protected: float m_checkEndTime;
float m_winDelay;
float m_lostDelay;
- BOOL m_bFixScene; // scene fixed, no interraction
- BOOL m_bBase; // OBJECT_BASE exists in mission
+ bool m_bFixScene; // scene fixed, no interraction
+ bool m_bBase; // OBJECT_BASE exists in mission
FPOINT m_lastMousePos;
CObject* m_selectObject;
Phase m_phase;
int m_cameraRank;
D3DCOLORVALUE m_color;
- BOOL m_bFreePhoto;
- BOOL m_bCmdEdit;
- BOOL m_bShowPos;
- BOOL m_bSelectInsect;
- BOOL m_bShowSoluce;
- BOOL m_bShowAll;
- BOOL m_bCheatRadar;
- BOOL m_bAudioRepeat;
- BOOL m_bShortCut;
+ bool m_bFreePhoto;
+ bool m_bCmdEdit;
+ bool m_bShowPos;
+ bool m_bSelectInsect;
+ bool m_bShowSoluce;
+ bool m_bShowAll;
+ bool m_bCheatRadar;
+ bool m_bAudioRepeat;
+ bool m_bShortCut;
int m_audioTrack;
int m_delayWriteMessage;
int m_movieInfoIndex;
- BOOL m_bImmediatSatCom; // SatCom immediately?
- BOOL m_bBeginSatCom; // messages SatCom poster?
- BOOL m_bMovieLock; // movie in progress?
- BOOL m_bSatComLock; // call of SatCom is possible?
- BOOL m_bEditLock; // edition in progress?
- BOOL m_bEditFull; // edition in full screen?
- BOOL m_bPause; // simulation paused
- BOOL m_bHilite;
- BOOL m_bTrainerPilot; // remote trainer?
- BOOL m_bSuspend;
- BOOL m_bFriendAim;
- BOOL m_bResetCreate;
- BOOL m_bMapShow;
- BOOL m_bMapImage;
+ bool m_bImmediatSatCom; // SatCom immediately?
+ bool m_bBeginSatCom; // messages SatCom poster?
+ bool m_bMovieLock; // movie in progress?
+ bool m_bSatComLock; // call of SatCom is possible?
+ bool m_bEditLock; // edition in progress?
+ bool m_bEditFull; // edition in full screen?
+ bool m_bPause; // simulation paused
+ bool m_bHilite;
+ bool m_bTrainerPilot; // remote trainer?
+ bool m_bSuspend;
+ bool m_bFriendAim;
+ bool m_bResetCreate;
+ bool m_bMapShow;
+ bool m_bMapImage;
char m_mapFilename[100];
FPOINT m_tooltipPos;
@@ -406,13 +406,13 @@ protected: char m_scriptFile[100];
int m_endingWinRank;
int m_endingLostRank;
- BOOL m_bWinTerminate;
+ bool m_bWinTerminate;
float m_fontSize;
FPOINT m_windowPos;
FPOINT m_windowDim;
- BOOL m_IOPublic;
+ bool m_IOPublic;
FPOINT m_IOPos;
FPOINT m_IODim;
diff --git a/src/object/task/task.cpp b/src/object/task/task.cpp index ad1c848..4be6067 100644 --- a/src/object/task/task.cpp +++ b/src/object/task/task.cpp @@ -77,9 +77,9 @@ CTask::~CTask() // Management of an event.
-BOOL CTask::EventProcess(const Event &event)
+bool CTask::EventProcess(const Event &event)
{
- return TRUE;
+ return true;
}
@@ -93,17 +93,17 @@ Error CTask::IsEnded() // Indicates whether the action is pending.
-BOOL CTask::IsBusy()
+bool CTask::IsBusy()
{
- return TRUE;
+ return true;
}
// Suddenly ends the current action.
-BOOL CTask::Abort()
+bool CTask::Abort()
{
- return TRUE;
+ return true;
}
diff --git a/src/object/task/task.h b/src/object/task/task.h index 1970f7f..b85fa32 100644 --- a/src/object/task/task.h +++ b/src/object/task/task.h @@ -60,10 +60,10 @@ public: CTask(CInstanceManager* iMan, CObject* object);
virtual ~CTask();
- virtual BOOL EventProcess(const Event &event);
+ virtual bool EventProcess(const Event &event);
virtual Error IsEnded();
- virtual BOOL IsBusy();
- virtual BOOL Abort();
+ virtual bool IsBusy();
+ virtual bool Abort();
protected:
diff --git a/src/object/task/taskadvance.cpp b/src/object/task/taskadvance.cpp index 8bbc7b3..41b1602 100644 --- a/src/object/task/taskadvance.cpp +++ b/src/object/task/taskadvance.cpp @@ -44,7 +44,6 @@ CTaskAdvance::CTaskAdvance(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
}
// Object's destructor.
@@ -56,10 +55,10 @@ CTaskAdvance::~CTaskAdvance() // Management of an event.
-BOOL CTaskAdvance::EventProcess(const Event &event)
+bool CTaskAdvance::EventProcess(const Event &event)
{
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_fixTime += event.rTime;
@@ -68,12 +67,12 @@ BOOL CTaskAdvance::EventProcess(const Event &event) {
m_physics->SetMotorSpeedX(0.0f); // stops the advance
m_physics->SetMotorSpeedZ(0.0f); // stops the rotation
- m_bError = TRUE;
- return TRUE;
+ m_bError = true;
+ return true;
}
m_timeLimit -= event.rTime;
- return TRUE;
+ return true;
}
@@ -95,7 +94,7 @@ Error CTaskAdvance::Start(float length) m_physics->SetMotorSpeedY(0.0f);
m_physics->SetMotorSpeedZ(0.0f);
- m_bError = FALSE;
+ m_bError = false;
return ERR_OK;
}
diff --git a/src/object/task/taskadvance.h b/src/object/task/taskadvance.h index 8717728..2b2dcef 100644 --- a/src/object/task/taskadvance.h +++ b/src/object/task/taskadvance.h @@ -36,7 +36,7 @@ public: CTaskAdvance(CInstanceManager* iMan, CObject* object);
~CTaskAdvance();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(float length);
Error IsEnded();
@@ -51,6 +51,6 @@ protected: D3DVECTOR m_startPos;
float m_lastDist;
float m_fixTime;
- BOOL m_bError;
+ bool m_bError;
};
diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index 5992e5d..77ee14d 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -56,8 +56,6 @@ CTaskBuild::CTaskBuild(CInstanceManager* iMan, CObject* object) {
int i;
- CTask::CTask(iMan, object);
-
m_type = OBJECT_DERRICK;
m_time = 0.0f;
m_soundChannel = -1;
@@ -91,17 +89,17 @@ CTaskBuild::~CTaskBuild() // Creates a building.
-BOOL CTaskBuild::CreateBuilding(D3DVECTOR pos, float angle)
+bool CTaskBuild::CreateBuilding(D3DVECTOR pos, float angle)
{
m_building = new CObject(m_iMan);
if ( !m_building->CreateBuilding(pos, angle, 0.0f, m_type, 0.0f) )
{
delete m_building;
m_building = 0;
- return FALSE;
+ return false;
}
m_building->UpdateMapping();
- m_building->SetLock(TRUE); // not yet usable
+ m_building->SetLock(true); // not yet usable
if ( m_type == OBJECT_DERRICK ) m_buildingHeight = 35.0f;
if ( m_type == OBJECT_FACTORY ) m_buildingHeight = 28.0f;
@@ -121,7 +119,7 @@ BOOL CTaskBuild::CreateBuilding(D3DVECTOR pos, float angle) m_buildingPos = m_building->RetPosition(0);
m_buildingPos.y -= m_buildingHeight;
m_building->SetPosition(0, m_buildingPos);
- return TRUE;
+ return true;
}
// Creates lights for the effects.
@@ -185,7 +183,7 @@ void CTaskBuild::CreateLight() angle += (PI*2.0f)/TBMAXLIGHT;
}
- m_bBlack = FALSE;
+ m_bBlack = false;
}
// Switches the lights from black to white.
@@ -207,21 +205,21 @@ void CTaskBuild::BlackLight() m_light->SetLightColorSpeed(m_lightRank[i], 1.0f/((1.0f/m_speed)*0.75f));
}
- m_bBlack = TRUE;
+ m_bBlack = true;
}
// Management of an event.
-BOOL CTaskBuild::EventProcess(const Event &event)
+bool CTaskBuild::EventProcess(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR pos, dir, speed;
FPOINT dim;
float a, g, cirSpeed, dist, linSpeed;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
m_time += event.rTime;
@@ -236,7 +234,7 @@ BOOL CTaskBuild::EventProcess(const Event &event) if ( cirSpeed < -1.0f ) cirSpeed = -1.0f;
m_physics->SetMotorSpeedZ(cirSpeed); // turns left/right
- return TRUE;
+ return true;
}
if ( m_phase == TBP_MOVE ) // preliminary forward/backward?
@@ -246,48 +244,48 @@ BOOL CTaskBuild::EventProcess(const Event &event) if ( dist > 30.0f ) linSpeed = 1.0f;
if ( dist < 30.0f ) linSpeed = -1.0f;
m_physics->SetMotorSpeedX(linSpeed); // forward/backward
- return TRUE;
+ return true;
}
if ( m_phase == TBP_RECEDE ) // terminal back?
{
m_physics->SetMotorSpeedX(-1.0f); // back
- return TRUE;
+ return true;
}
if ( m_phase == TBP_TAKE ) // takes gun?
{
- return TRUE;
+ return true;
}
if ( m_phase == TBP_PREP ) // prepares?
{
- return TRUE;
+ return true;
}
if ( m_phase == TBP_TERM ) // ends?
{
- return TRUE;
+ return true;
}
if ( !m_bBuild ) // building to build?
{
- m_bBuild = TRUE;
+ m_bBuild = true;
pos = m_metal->RetPosition(0);
a = m_object->RetAngleY(0);
if ( !CreateBuilding(pos, a+PI) )
{
- m_metal->SetLock(FALSE); // usable again
+ m_metal->SetLock(false); // usable again
m_motion->SetAction(-1);
m_object->SetObjectParent(14, 0);
m_object->SetPosition(14, D3DVECTOR(-1.5f, 0.3f, -1.35f));
m_object->SetAngleZ(14, PI);
m_camera->FlushEffect();
Abort();
- m_bError = TRUE;
+ m_bError = true;
m_displayText->DisplayError(ERR_TOOMANY, m_object->RetPosition(0));
- return FALSE;
+ return false;
}
CreateLight();
}
@@ -340,7 +338,7 @@ BOOL CTaskBuild::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -360,7 +358,7 @@ Error CTaskBuild::Start(ObjectType type) iAngle = NormAngle(iAngle); // 0..2*PI
oAngle = iAngle;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
pos = m_object->RetPosition(0);
if ( pos.y < m_water->RetLevel() ) return ERR_BUILD_WATER;
@@ -385,7 +383,7 @@ Error CTaskBuild::Start(ObjectType type) err = FlatFloor();
if ( err != ERR_OK ) return err;
- m_metal->SetLock(TRUE); // not usable
+ m_metal->SetLock(true); // not usable
m_camera->StartCentering(m_object, PI*0.15f, 99.9f, 0.0f, 1.0f);
m_phase = TBP_TURN; // rotation necessary preliminary
@@ -396,10 +394,10 @@ Error CTaskBuild::Start(ObjectType type) pm = m_metal->RetPosition(0);
m_angleZ = RotateAngle(Length2d(pv, pm), Abs(pv.y-pm.y));
- m_physics->SetFreeze(TRUE); // it does not move
+ m_physics->SetFreeze(true); // it does not move
- m_bBuild = FALSE; // not yet built
- m_bError = FALSE; // ok
+ m_bBuild = false; // not yet built
+ m_bError = false; // ok
return ERR_OK;
}
@@ -456,7 +454,7 @@ Error CTaskBuild::IsEnded() {
if ( m_progress > 1.0f ) // timeout?
{
- m_metal->SetLock(FALSE); // usable again
+ m_metal->SetLock(false); // usable again
if ( dist < 30.0f ) return ERR_BUILD_METALNEAR;
else return ERR_BUILD_METALAWAY;
}
@@ -482,7 +480,7 @@ Error CTaskBuild::IsEnded() {
if ( m_progress < 1.0f ) return ERR_CONTINUE;
- m_soundChannel = m_sound->Play(SOUND_TREMBLE, m_object->RetPosition(0), 0.0f, 1.0f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_TREMBLE, m_object->RetPosition(0), 0.0f, 1.0f, true);
m_sound->AddEnvelope(m_soundChannel, 0.7f, 1.0f, 1.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.7f, 1.5f, 7.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 1.5f, 2.0f, SOPER_STOP);
@@ -506,7 +504,7 @@ Error CTaskBuild::IsEnded() m_building->SetZoom(0, 1.0f);
m_building->SetCirVibration(D3DVECTOR(0.0f, 0.0f, 0.0f));
- m_building->SetLock(FALSE); // building usable
+ m_building->SetLock(false); // building usable
m_main->CreateShortcuts();
m_displayText->DisplayError(INFO_BUILD, m_buildingPos, 10.0f, 50.0f);
@@ -555,7 +553,7 @@ Error CTaskBuild::IsEnded() // Suddenly ends the current action.
-BOOL CTaskBuild::Abort()
+bool CTaskBuild::Abort()
{
if ( m_soundChannel != -1 )
{
@@ -565,8 +563,8 @@ BOOL CTaskBuild::Abort() }
m_camera->StopCentering(m_object, 2.0f);
- m_physics->SetFreeze(FALSE); // is moving again
- return TRUE;
+ m_physics->SetFreeze(false); // is moving again
+ return true;
}
@@ -581,7 +579,7 @@ Error CTaskBuild::FlatFloor() FPOINT c, p;
float radius, max, oRadius, bRadius, angle, dist;
int i, j;
- BOOL bLittleFlat, bBase;
+ bool bLittleFlat, bBase;
radius = 0.0f;
if ( m_type == OBJECT_DERRICK ) radius = 5.0f;
@@ -614,7 +612,7 @@ Error CTaskBuild::FlatFloor() }
max = 100000.0f;
- bBase = FALSE;
+ bBase = false;
for ( i=0 ; i<1000000 ; i++ )
{
pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i);
@@ -635,7 +633,7 @@ Error CTaskBuild::FlatFloor() max = dist;
bPos = oPos;
bRadius = oRadius;
- bBase = TRUE;
+ bBase = true;
}
}
else
@@ -649,7 +647,7 @@ Error CTaskBuild::FlatFloor() max = dist;
bPos = oPos;
bRadius = oRadius;
- bBase = FALSE;
+ bBase = false;
}
}
}
@@ -725,7 +723,7 @@ CObject* CTaskBuild::SearchMetalObject(float &angle, float dMin, float dMax, ObjectType type;
float min, iAngle, a, aa, aBest, distance, magic;
int i;
- BOOL bMetal;
+ bool bMetal;
iPos = m_object->RetPosition(0);
iAngle = m_object->RetAngleY(0);
@@ -733,7 +731,7 @@ CObject* CTaskBuild::SearchMetalObject(float &angle, float dMin, float dMax, min = 1000000.0f;
pBest = 0;
- bMetal = FALSE;
+ bMetal = false;
for ( i=0 ; i<1000000 ; i++ )
{
pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i);
@@ -745,7 +743,7 @@ CObject* CTaskBuild::SearchMetalObject(float &angle, float dMin, float dMax, type = pObj->RetType();
if ( type != OBJECT_METAL ) continue;
- bMetal = TRUE; // metal exists
+ bMetal = true; // metal exists
oPos = pObj->RetPosition(0);
distance = Length(oPos, iPos);
diff --git a/src/object/task/taskbuild.h b/src/object/task/taskbuild.h index 4f045b1..337edb7 100644 --- a/src/object/task/taskbuild.h +++ b/src/object/task/taskbuild.h @@ -53,15 +53,15 @@ public: CTaskBuild(CInstanceManager* iMan, CObject* object);
~CTaskBuild();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(ObjectType type);
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
Error FlatFloor();
- BOOL CreateBuilding(D3DVECTOR pos, float angle);
+ bool CreateBuilding(D3DVECTOR pos, float angle);
void CreateLight();
void BlackLight();
CObject* SearchMetalObject(float &angle, float dMin, float dMax, float aLimit, Error &err);
@@ -73,9 +73,9 @@ protected: CObject* m_power; // the vehicle battery
CObject* m_building; // building built
TaskBuildPhase m_phase; // phase of the operation
- BOOL m_bError; // TRUE -> operation impossible
- BOOL m_bBuild; // TRUE -> building built
- BOOL m_bBlack; // TRUE -> lights black -> white
+ bool m_bError; // true -> operation impossible
+ bool m_bBuild; // true -> building built
+ bool m_bBlack; // true -> lights black -> white
float m_time; // absolute time
float m_lastParticule; // time of generation last particle
float m_progress; // progression (0..1)
diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index 0944931..02c4159 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -50,7 +50,6 @@ CTaskFire::CTaskFire(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
m_soundChannel = -1;
}
@@ -69,7 +68,7 @@ CTaskFire::~CTaskFire() // Management of an event.
-BOOL CTaskFire::EventProcess(const Event &event)
+bool CTaskFire::EventProcess(const Event &event)
{
CObject* power;
CPhysics* physics;
@@ -80,9 +79,9 @@ BOOL CTaskFire::EventProcess(const Event &event) float energy, fire;
int i, channel;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
m_time += event.rTime;
m_lastSound -= event.rTime;
@@ -273,7 +272,7 @@ BOOL CTaskFire::EventProcess(const Event &event) m_sound->Play(SOUND_FIREp, m_object->RetPosition(0));
}
- return TRUE;
+ return true;
}
@@ -286,7 +285,7 @@ Error CTaskFire::Start(float delay) float energy, fire;
ObjectType type;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
type = m_object->RetType();
if ( type != OBJECT_MOBILEfc &&
@@ -307,13 +306,13 @@ Error CTaskFire::Start(float delay) m_bRay = (type == OBJECT_MOBILErc);
- m_bOrganic = FALSE;
+ m_bOrganic = false;
if ( type == OBJECT_MOBILEfi ||
type == OBJECT_MOBILEti ||
type == OBJECT_MOBILEwi ||
type == OBJECT_MOBILEii )
{
- m_bOrganic = TRUE;
+ m_bOrganic = true;
}
if ( delay == 0.0f )
@@ -336,13 +335,13 @@ Error CTaskFire::Start(float delay) m_time = 0.0f;
m_lastParticule = 0.0f;
m_lastSound = 0.0f;
- m_bError = FALSE; // ok
+ m_bError = false; // ok
//? m_camera->StartCentering(m_object, PI*0.15f, 99.9f, 0.0f, 1.0f);
if ( m_bOrganic )
{
- m_soundChannel = m_sound->Play(SOUND_FIREi, m_object->RetPosition(0), 1.0f, 1.0f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_FIREi, m_object->RetPosition(0), 1.0f, 1.0f, true);
if ( m_soundChannel != -1 )
{
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, m_delay, SOPER_CONTINUE);
@@ -354,7 +353,7 @@ Error CTaskFire::Start(float delay) }
else
{
- m_soundChannel = m_sound->Play(SOUND_FIRE, m_object->RetPosition(0), 1.0f, 1.0f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_FIRE, m_object->RetPosition(0), 1.0f, 1.0f, true);
if ( m_soundChannel != -1 )
{
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, m_delay, SOPER_CONTINUE);
@@ -379,7 +378,7 @@ Error CTaskFire::IsEnded() // Suddenly ends the current action.
-BOOL CTaskFire::Abort()
+bool CTaskFire::Abort()
{
m_object->SetInclinaison(D3DVECTOR(0.0f, 0.0f, 0.0f));
m_object->SetCirVibration(D3DVECTOR(0.0f, 0.0f, 0.0f));
@@ -393,6 +392,6 @@ BOOL CTaskFire::Abort() }
//? m_camera->StopCentering(m_object, 1.0f);
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskfire.h b/src/object/task/taskfire.h index 72b5402..f3d4490 100644 --- a/src/object/task/taskfire.h +++ b/src/object/task/taskfire.h @@ -35,20 +35,20 @@ public: CTaskFire(CInstanceManager* iMan, CObject* object);
~CTaskFire();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(float delay);
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
protected:
float m_delay;
float m_progress;
- BOOL m_bError;
- BOOL m_bRay;
- BOOL m_bOrganic;
+ bool m_bError;
+ bool m_bRay;
+ bool m_bOrganic;
float m_time;
float m_speed;
float m_lastParticule;
diff --git a/src/object/task/taskfireant.cpp b/src/object/task/taskfireant.cpp index 6947c1b..6f3b9c9 100644 --- a/src/object/task/taskfireant.cpp +++ b/src/object/task/taskfireant.cpp @@ -47,8 +47,6 @@ CTaskFireAnt::CTaskFireAnt(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
-
m_phase = TFA_NULL;
}
@@ -61,19 +59,19 @@ CTaskFireAnt::~CTaskFireAnt() // Management of an event.
-BOOL CTaskFireAnt::EventProcess(const Event &event)
+bool CTaskFireAnt::EventProcess(const Event &event)
{
D3DVECTOR dir, vib;
float a, g, cirSpeed;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
if ( m_object->RetFixed() ) // insect on its back?
{
- m_bError = TRUE;
- return FALSE;
+ m_bError = true;
+ return false;
}
m_time += event.rTime;
@@ -90,7 +88,7 @@ BOOL CTaskFireAnt::EventProcess(const Event &event) m_physics->SetMotorSpeedZ(cirSpeed); // turns left/right
}
- return TRUE;
+ return true;
}
@@ -103,7 +101,7 @@ Error CTaskFireAnt::Start(D3DVECTOR impact) m_impact = impact;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
if ( !m_physics->RetLand() ) return ERR_FIRE_VEH;
type = m_object->RetType();
@@ -122,8 +120,8 @@ Error CTaskFireAnt::Start(D3DVECTOR impact) m_progress = 0.0f;
m_time = 0.0f;
m_lastParticule = 0.0f;
- m_bError = FALSE; // ok
- m_bFire = FALSE; // once!
+ m_bError = false; // ok
+ m_bFire = false; // once!
return ERR_OK;
}
@@ -174,7 +172,7 @@ Error CTaskFireAnt::IsEnded() {
if ( m_progress > 0.75f && !m_bFire )
{
- m_bFire = TRUE; // once
+ m_bFire = true; // once
for ( i=0 ; i<20 ; i++ )
{
@@ -219,9 +217,9 @@ Error CTaskFireAnt::IsEnded() // Suddenly ends the current action.
-BOOL CTaskFireAnt::Abort()
+bool CTaskFireAnt::Abort()
{
m_motion->SetAction(-1);
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskfireant.h b/src/object/task/taskfireant.h index 18eef90..a94d943 100644 --- a/src/object/task/taskfireant.h +++ b/src/object/task/taskfireant.h @@ -47,11 +47,11 @@ public: CTaskFireAnt(CInstanceManager* iMan, CObject* object);
~CTaskFireAnt();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(D3DVECTOR impact);
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
@@ -61,8 +61,8 @@ protected: float m_progress;
float m_speed;
float m_angle;
- BOOL m_bError;
- BOOL m_bFire;
+ bool m_bError;
+ bool m_bFire;
float m_time;
float m_lastParticule;
};
diff --git a/src/object/task/taskflag.cpp b/src/object/task/taskflag.cpp index 6c228c4..667b179 100644 --- a/src/object/task/taskflag.cpp +++ b/src/object/task/taskflag.cpp @@ -52,7 +52,6 @@ CTaskFlag::CTaskFlag(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
}
// Object's destructor.
@@ -64,15 +63,15 @@ CTaskFlag::~CTaskFlag() // Management of an event.
-BOOL CTaskFlag::EventProcess(const Event &event)
+bool CTaskFlag::EventProcess(const Event &event)
{
- if ( m_bError ) return TRUE;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_bError ) return true;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_time += event.rTime;
- return TRUE;
+ return true;
}
@@ -87,7 +86,7 @@ Error CTaskFlag::Start(TaskFlagOrder order, int rank) m_order = order;
m_time = 0.0f;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
if ( !m_physics->RetLand() )
{
pos = m_object->RetPosition(0);
@@ -113,7 +112,7 @@ Error CTaskFlag::Start(TaskFlagOrder order, int rank) if ( err != ERR_OK ) return err;
}
- m_bError = FALSE;
+ m_bError = false;
m_motion->SetAction(MHS_FLAG); // sets/removes flag
m_camera->StartCentering(m_object, PI*0.3f, 99.9f, 0.0f, 0.5f);
@@ -136,11 +135,11 @@ Error CTaskFlag::IsEnded() // Suddenly ends the current action.
-BOOL CTaskFlag::Abort()
+bool CTaskFlag::Abort()
{
m_motion->SetAction(-1);
m_camera->StopCentering(m_object, 2.0f);
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskflag.h b/src/object/task/taskflag.h index 4c06630..31876fe 100644 --- a/src/object/task/taskflag.h +++ b/src/object/task/taskflag.h @@ -43,11 +43,11 @@ public: CTaskFlag(CInstanceManager* iMan, CObject* object);
~CTaskFlag();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(TaskFlagOrder order, int rank);
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
Error CreateFlag(int rank);
@@ -58,6 +58,6 @@ protected: protected:
TaskFlagOrder m_order;
float m_time;
- BOOL m_bError;
+ bool m_bError;
};
diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index ec10f0a..7e4d3f1 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -51,8 +51,6 @@ CTaskGoto::CTaskGoto(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
-
m_bmArray = 0;
}
@@ -66,25 +64,25 @@ CTaskGoto::~CTaskGoto() // Management of an event.
-BOOL CTaskGoto::EventProcess(const Event &event)
+bool CTaskGoto::EventProcess(const Event &event)
{
D3DVECTOR pos, goal;
FPOINT rot, repulse;
float a, g, dist, linSpeed, cirSpeed, h, hh, factor, dir;
Error ret;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
// Momentarily stationary object (ant on the back)?
if ( m_object->RetFixed() )
{
m_physics->SetMotorSpeedX(0.0f); // stops the advance
m_physics->SetMotorSpeedZ(0.0f); // stops the rotation
- return TRUE;
+ return true;
}
- if ( m_error != ERR_OK ) return FALSE;
+ if ( m_error != ERR_OK ) return false;
if ( m_bWorm )
{
@@ -129,7 +127,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right
m_physics->SetMotorSpeedX(linSpeed); // advance
- return TRUE;
+ return true;
}
if ( m_phase == TGP_BEAMSEARCH ) // search path?
@@ -190,27 +188,27 @@ BOOL CTaskGoto::EventProcess(const Event &event) BitmapDebug(min, max, m_object->RetPosition(0), m_goal);
#endif
m_error = ret;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
if ( m_phase == TGP_BEAMWCOLD ) // expects cooled reactor?
{
- return TRUE;
+ return true;
}
if ( m_phase == TGP_BEAMUP ) // off?
{
m_physics->SetMotorSpeedY(1.0f); // up
- return TRUE;
+ return true;
}
if ( m_phase == TGP_BEAMGOTO ) // goto dot list? (?)
{
if ( m_physics->RetCollision() ) // collision?
{
- m_physics->SetCollision(FALSE); // there's more
+ m_physics->SetCollision(false); // there's more
}
pos = m_object->RetPosition(0);
@@ -231,7 +229,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) {
goal = m_bmPoints[m_bmIndex];
goal.y = pos.y;
- h = m_terrain->RetFloorHeight(goal, TRUE, TRUE);
+ h = m_terrain->RetFloorHeight(goal, true, true);
dist = Length2d(pos, goal);
if ( dist != 0.0f ) // anticipates?
{
@@ -241,7 +239,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) goal.z = pos.z + (goal.z-pos.z)*linSpeed*20.0f/dist;
}
goal.y = pos.y;
- hh = m_terrain->RetFloorHeight(goal, TRUE, TRUE);
+ hh = m_terrain->RetFloorHeight(goal, true, true);
h = Min(h, hh);
linSpeed = 0.0f;
if ( h < m_altitude-1.0f )
@@ -303,24 +301,24 @@ BOOL CTaskGoto::EventProcess(const Event &event) m_physics->SetMotorSpeedX(0.0f); // stops the advance
m_physics->SetMotorSpeedZ(0.0f); // stops the rotation
BeamStart(); // we start all
- return TRUE;
+ return true;
}
m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right
m_physics->SetMotorSpeedX(linSpeed); // advance
- return TRUE;
+ return true;
}
if ( m_phase == TGP_BEAMDOWN ) // landed?
{
m_physics->SetMotorSpeedY(-0.5f); // tomb
- return TRUE;
+ return true;
}
if ( m_phase == TGP_LAND ) // landed?
{
m_physics->SetMotorSpeedY(-0.5f); // tomb
- return TRUE;
+ return true;
}
if ( m_goalMode == TGG_EXPRESS )
@@ -329,9 +327,9 @@ BOOL CTaskGoto::EventProcess(const Event &event) {
if ( m_physics->RetCollision() ) // collision?
{
- m_physics->SetCollision(FALSE); // there's more
+ m_physics->SetCollision(false); // there's more
m_error = ERR_STOP;
- return TRUE;
+ return true;
}
}
@@ -339,7 +337,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) if ( m_altitude > 0.0f )
{
- h = m_terrain->RetFloorHeight(pos, TRUE, TRUE);
+ h = m_terrain->RetFloorHeight(pos, true, true);
linSpeed = 0.0f;
if ( h < m_altitude )
{
@@ -362,7 +360,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right
m_physics->SetMotorSpeedX(1.0f); // advance
- return TRUE;
+ return true;
}
if ( m_phase != TGP_TURN &&
@@ -375,7 +373,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) if ( factor < 0.0f ) factor = 0.0f;
if ( factor > 1.0f ) factor = 1.0f;
- h = m_terrain->RetFloorHeight(m_object->RetPosition(0), TRUE, TRUE);
+ h = m_terrain->RetFloorHeight(m_object->RetPosition(0), true, true);
linSpeed = 0.0f;
if ( h < (m_altitude-0.5f)*factor && factor == 1.0f )
{
@@ -395,10 +393,10 @@ BOOL CTaskGoto::EventProcess(const Event &event) {
if ( m_physics->RetCollision() ) // collision?
{
- m_physics->SetCollision(FALSE); // there's more
+ m_physics->SetCollision(false); // there's more
m_time = 0.0f;
m_phase = TGP_CRWAIT;
- return TRUE;
+ return true;
}
#if 0
@@ -487,10 +485,10 @@ BOOL CTaskGoto::EventProcess(const Event &event) {
if ( m_physics->RetCollision() ) // collision?
{
- m_physics->SetCollision(FALSE); // there's more
+ m_physics->SetCollision(false); // there's more
m_time = 0.0f;
m_phase = TGP_CLWAIT;
- return TRUE;
+ return true;
}
m_physics->SetMotorSpeedX(0.5f); // advance mollo
}
@@ -499,10 +497,10 @@ BOOL CTaskGoto::EventProcess(const Event &event) {
if ( m_physics->RetCollision() ) // collision?
{
- m_physics->SetCollision(FALSE); // there's more
+ m_physics->SetCollision(false); // there's more
m_time = 0.0f;
m_phase = TGP_CRWAIT;
- return TRUE;
+ return true;
}
m_physics->SetMotorSpeedX(0.5f); // advance mollo
}
@@ -513,7 +511,7 @@ BOOL CTaskGoto::EventProcess(const Event &event) m_physics->SetMotorSpeedX(1.0f);
}
- return TRUE;
+ return true;
}
@@ -618,7 +616,7 @@ void CTaskGoto::WormFrame(float rTime) dist = Length(pos, impact);
if ( dist <= 15.0f )
{
- pObj->SetVirusMode(TRUE); // bam, infected!
+ pObj->SetVirusMode(true); // bam, infected!
}
}
}
@@ -672,7 +670,7 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, m_goalObject = goal;
m_goal = goal;
- m_bTake = FALSE;
+ m_bTake = false;
m_phase = TGP_ADVANCE;
m_error = ERR_OK;
m_try = 0;
@@ -686,14 +684,14 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, m_crashMode = TGC_RIGHTLEFT;
}
- m_bWorm = FALSE;
+ m_bWorm = false;
if ( type == OBJECT_WORM )
{
- m_bWorm = TRUE;
+ m_bWorm = true;
m_wormLastTime = 0.0f;
}
- m_bApprox = FALSE;
+ m_bApprox = false;
if ( type == OBJECT_HUMAN ||
type == OBJECT_TECH ||
type == OBJECT_MOTHER ||
@@ -706,7 +704,7 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, type == OBJECT_MOBILErr ||
type == OBJECT_MOBILErs )
{
- m_bApprox = TRUE;
+ m_bApprox = true;
}
if ( !m_bApprox && m_crashMode != TGC_BEAM )
@@ -721,12 +719,12 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, dist = 0.0f;
AdjustTarget(target, m_goal, dist);
}
- m_bTake = TRUE; // object was taken on arrival (final rotation)
+ m_bTake = true; // object was taken on arrival (final rotation)
}
}
m_lastDistance = 1000.0f;
- m_physics->SetCollision(FALSE);
+ m_physics->SetCollision(false);
if ( m_crashMode == TGC_BEAM ) // with the algorithm of rays?
{
@@ -751,7 +749,7 @@ Error CTaskGoto::Start(D3DVECTOR goal, float altitude, m_bmFinalMove = dist;
}
}
- m_bTake = TRUE; // object was taken on arrival (final rotation)
+ m_bTake = true; // object was taken on arrival (final rotation)
}
if ( m_physics->RetType() == TYPE_FLYING && m_altitude == 0.0f )
@@ -833,7 +831,7 @@ Error CTaskGoto::IsEnded() {
if ( m_physics->RetType() == TYPE_FLYING && m_altitude > 0.0f )
{
- level = m_terrain->RetFloorLevel(pos, TRUE, TRUE);
+ level = m_terrain->RetFloorLevel(pos, true, true);
h = level+m_altitude-20.0f;
limit = m_terrain->RetFlyingMaxHeight();
if ( h > limit ) h = limit;
@@ -1096,9 +1094,9 @@ CObject* CTaskGoto::SearchTarget(D3DVECTOR pos, float margin) }
// Adjusts the target as a function of the object.
-// Returns TRUE if it is cargo laying on the ground, which can be approached from any site.
+// Returns true if it is cargo laying on the ground, which can be approached from any site.
-BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance)
+bool CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance)
{
ObjectType type;
Character* character;
@@ -1111,7 +1109,7 @@ BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) type == OBJECT_WORM )
{
pos = pObj->RetPosition(0);
- return FALSE; // single approach
+ return false; // single approach
}
type = pObj->RetType();
@@ -1146,7 +1144,7 @@ BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) goal = pObj->RetPosition(0);
dist = Length(goal, pos);
pos = (pos-goal)*(TAKE_DIST+distance)/dist + goal;
- return TRUE; // approach from all sites
+ return true; // approach from all sites
}
if ( type == OBJECT_BASE )
@@ -1155,7 +1153,7 @@ BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) goal = pObj->RetPosition(0);
dist = Length(goal, pos);
pos = (pos-goal)*(TAKE_DIST+distance)/dist + goal;
- return TRUE; // approach from all sites
+ return true; // approach from all sites
}
if ( type == OBJECT_MOBILEfa ||
@@ -1191,25 +1189,25 @@ BOOL CTaskGoto::AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance) pos.x -= TAKE_DIST+TAKE_DIST_OTHER+distance;
mat = pObj->RetWorldMatrix(0);
pos = Transform(*mat, pos);
- return FALSE; // single approach
+ return false; // single approach
}
- if ( GetHotPoint(pObj, goal, TRUE, distance, suppl) )
+ if ( GetHotPoint(pObj, goal, true, distance, suppl) )
{
pos = goal;
distance += suppl;
- return FALSE; // single approach
+ return false; // single approach
}
pos = pObj->RetPosition(0);
distance = 0.0f;
- return FALSE; // single approach
+ return false; // single approach
}
// If you are on an object produced by a building (ore produced by derrick),
// changes the position by report the building.
-BOOL CTaskGoto::AdjustBuilding(D3DVECTOR &pos, float margin, float &distance)
+bool CTaskGoto::AdjustBuilding(D3DVECTOR &pos, float margin, float &distance)
{
CObject* pObj;
D3DVECTOR oPos;
@@ -1224,22 +1222,22 @@ BOOL CTaskGoto::AdjustBuilding(D3DVECTOR &pos, float margin, float &distance) if ( !pObj->RetActif() ) continue;
if ( pObj->RetTruck() != 0 ) continue; // object transported?
- if ( !GetHotPoint(pObj, oPos, FALSE, 0.0f, suppl) ) continue;
+ if ( !GetHotPoint(pObj, oPos, false, 0.0f, suppl) ) continue;
dist = Length2d(pos, oPos);
if ( dist <= margin )
{
- GetHotPoint(pObj, pos, TRUE, distance, suppl);
+ GetHotPoint(pObj, pos, true, distance, suppl);
distance += suppl;
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
// Returns the item or product or pose is something on a building.
-BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos,
- BOOL bTake, float distance, float &suppl)
+bool CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos,
+ bool bTake, float distance, float &suppl)
{
ObjectType type;
D3DMATRIX* mat;
@@ -1255,7 +1253,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f;
if ( bTake ) pos.x += TAKE_DIST+distance+suppl;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_CONVERT )
@@ -1265,7 +1263,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f;
if ( bTake ) pos.x += TAKE_DIST+distance+suppl;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_RESEARCH )
@@ -1275,7 +1273,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 2.5f;
if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance+suppl;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_ENERGY )
@@ -1285,7 +1283,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 6.0f;
if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_TOWER )
@@ -1295,7 +1293,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f;
if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance+suppl;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_LABO )
@@ -1305,7 +1303,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 6.0f;
if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_NUCLEAR )
@@ -1315,7 +1313,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f;
if ( bTake ) pos.x += TAKE_DIST+TAKE_DIST_OTHER+distance+suppl;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_FACTORY )
@@ -1325,7 +1323,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 6.0f;
if ( bTake ) pos.x += TAKE_DIST+distance+suppl;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_STATION )
@@ -1335,7 +1333,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f;
if ( bTake ) pos.x += distance;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_REPAIR )
@@ -1345,7 +1343,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f;
if ( bTake ) pos.x += distance;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_DESTROYER )
@@ -1355,7 +1353,7 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 4.0f;
if ( bTake ) pos.x += TAKE_DIST+distance+suppl;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
if ( type == OBJECT_PARA && m_physics->RetType() == TYPE_FLYING )
@@ -1364,24 +1362,24 @@ BOOL CTaskGoto::GetHotPoint(CObject *pObj, D3DVECTOR &pos, if ( bTake && distance != 0.0f ) suppl = 20.0f;
if ( bTake ) pos.x += distance+suppl;
pos = Transform(*mat, pos);
- return TRUE;
+ return true;
}
suppl = 0.0f;
- return FALSE;
+ return false;
}
// Seeks an object too close that he must flee.
-BOOL CTaskGoto::LeakSearch(D3DVECTOR &pos, float &delay)
+bool CTaskGoto::LeakSearch(D3DVECTOR &pos, float &delay)
{
CObject *pObj, *pObstacle;
D3DVECTOR iPos, oPos, bPos;
float iRadius, oRadius, bRadius, dist, min, dir;
int i, j;
- if ( !m_physics->RetLand() ) return FALSE; // in flight?
+ if ( !m_physics->RetLand() ) return false; // in flight?
m_object->GetCrashSphere(0, iPos, iRadius);
@@ -1409,9 +1407,9 @@ BOOL CTaskGoto::LeakSearch(D3DVECTOR &pos, float &delay) }
}
}
- if ( min > iRadius+bRadius+4.0f ) return FALSE;
+ if ( min > iRadius+bRadius+4.0f ) return false;
- m_bLeakRecede = FALSE;
+ m_bLeakRecede = false;
dist = 4.0f;
dir = 1.0f;
@@ -1419,12 +1417,12 @@ BOOL CTaskGoto::LeakSearch(D3DVECTOR &pos, float &delay) {
dist = 16.0f;
dir = -1.0f;
- m_bLeakRecede = TRUE; // simply recoils
+ m_bLeakRecede = true; // simply recoils
}
pos = bPos;
delay = m_physics->RetLinTimeLength(dist, dir);
- return TRUE;
+ return true;
}
@@ -1484,7 +1482,7 @@ void CTaskGoto::ComputeRepulse(FPOINT &dir) CObject *pObj;
float gDist, add, addi, fac, dist, iRadius, oRadius;
int i, j;
- BOOL bAlien;
+ bool bAlien;
dir.x = 0.0f;
dir.y = 0.0f;
@@ -1558,14 +1556,14 @@ void CTaskGoto::ComputeRepulse(FPOINT &dir) }
}
- bAlien = FALSE;
+ bAlien = false;
if ( iType == OBJECT_MOTHER ||
iType == OBJECT_ANT ||
iType == OBJECT_SPIDER ||
iType == OBJECT_BEE ||
iType == OBJECT_WORM )
{
- bAlien = TRUE;
+ bAlien = true;
}
for ( i=0 ; i<1000000 ; i++ )
@@ -1705,7 +1703,7 @@ int CTaskGoto::BeamShortcut() for ( i=m_bmTotal ; i>=m_bmIndex+2 ; i-- ) // tries from the last
{
- if ( BitmapTestLine(m_bmPoints[m_bmIndex], m_bmPoints[i], 0.0f, FALSE) )
+ if ( BitmapTestLine(m_bmPoints[m_bmIndex], m_bmPoints[i], 0.0f, false) )
{
return i; // bingo, found
}
@@ -1816,7 +1814,7 @@ Error CTaskGoto::BeamExplore(const D3DVECTOR &prevPos, const D3DVECTOR &curPos, }
else
{
- if ( !BitmapTestLine(prevPos, curPos, angle/nbDiv, TRUE) ) return ERR_GOTO_IMPOSSIBLE;
+ if ( !BitmapTestLine(prevPos, curPos, angle/nbDiv, true) ) return ERR_GOTO_IMPOSSIBLE;
m_bmPoints[i] = curPos;
@@ -1830,7 +1828,7 @@ Error CTaskGoto::BeamExplore(const D3DVECTOR &prevPos, const D3DVECTOR &curPos, {
newPos = BeamPoint(curPos, goalPos, 0, Length2d(curPos, goalPos)-goalRadius);
}
- if ( BitmapTestLine(curPos, newPos, angle/nbDiv, FALSE) )
+ if ( BitmapTestLine(curPos, newPos, angle/nbDiv, false) )
{
m_bmPoints[i+1] = newPos;
m_bmTotal = i+1;
@@ -1981,18 +1979,18 @@ void CTaskGoto::BitmapDebug(const D3DVECTOR &min, const D3DVECTOR &max, // Tests if a path along a straight line is possible.
-BOOL CTaskGoto::BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal,
- float stepAngle, BOOL bSecond)
+bool CTaskGoto::BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal,
+ float stepAngle, bool bSecond)
{
D3DVECTOR pos, inc;
float dist, step;
float distNoB2;
int i, max, x, y;
- if ( m_bmArray == 0 ) return TRUE;
+ if ( m_bmArray == 0 ) return true;
dist = Length2d(start, goal);
- if ( dist == 0.0f ) return TRUE;
+ if ( dist == 0.0f ) return true;
step = BM_DIM_STEP*0.5f;
inc.x = (goal.x-start.x)*step/dist;
@@ -2027,7 +2025,7 @@ BOOL CTaskGoto::BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, if ( bSecond )
{
- if ( i > 2 && BitmapTestDot(1, x, y) ) return FALSE;
+ if ( i > 2 && BitmapTestDot(1, x, y) ) return false;
if ( step*(i+1) > distNoB2 && i < max-2 )
{
@@ -2035,9 +2033,9 @@ BOOL CTaskGoto::BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, }
}
- if ( BitmapTestDot(0, x, y) ) return FALSE;
+ if ( BitmapTestDot(0, x, y) ) return false;
}
- return TRUE;
+ return true;
}
// Adds the objects in the bitmap.
@@ -2063,7 +2061,7 @@ void CTaskGoto::BitmapObject() if ( pObj == m_bmFretObject ) continue;
if ( pObj->RetTruck() != 0 ) continue;
- h = m_terrain->RetFloorLevel(pObj->RetPosition(0), FALSE);
+ h = m_terrain->RetFloorLevel(pObj->RetPosition(0), false);
if ( m_physics->RetType() == TYPE_FLYING && m_altitude > 0.0f )
{
h += m_altitude;
@@ -2110,7 +2108,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) D3DVECTOR p;
float aLimit, angle, h;
int x, y;
- BOOL bAcceptWater, bFly;
+ bool bAcceptWater, bFly;
if ( minx > maxx ) Swap(minx, maxx);
if ( miny > maxy ) Swap(miny, maxy);
@@ -2129,8 +2127,8 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) miny >= m_bmMinY && maxy <= m_bmMaxY ) return;
aLimit = 20.0f*PI/180.0f;
- bAcceptWater = FALSE;
- bFly = FALSE;
+ bAcceptWater = false;
+ bFly = false;
type = m_object->RetType();
@@ -2163,7 +2161,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) if ( type == OBJECT_MOBILEsa ) // submarine caterpillars?
{
aLimit = 35.0f*PI/180.0f;
- bAcceptWater = TRUE;
+ bAcceptWater = true;
}
if ( type == OBJECT_MOBILEdr ) // designer caterpillars?
@@ -2178,7 +2176,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) type == OBJECT_MOBILEft ) // flying?
{
aLimit = 15.0f*PI/180.0f;
- bFly = TRUE;
+ bFly = true;
}
if ( type == OBJECT_MOBILEia ||
@@ -2201,7 +2199,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) if ( bFly ) // flying robot?
{
- h = m_terrain->RetFloorLevel(p, TRUE);
+ h = m_terrain->RetFloorLevel(p, true);
if ( h >= m_terrain->RetFlyingMaxHeight()-5.0f )
{
BitmapSetDot(0, x, y);
@@ -2211,7 +2209,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) if ( !bAcceptWater ) // not going underwater?
{
- h = m_terrain->RetFloorLevel(p, TRUE);
+ h = m_terrain->RetFloorLevel(p, true);
if ( h < m_water->RetLevel()-2.0f ) // under water (*)?
{
//? BitmapSetDot(0, x, y);
@@ -2238,7 +2236,7 @@ void CTaskGoto::BitmapTerrain(int minx, int miny, int maxx, int maxy) // Opens an empty bitmap.
-BOOL CTaskGoto::BitmapOpen()
+bool CTaskGoto::BitmapOpen()
{
BitmapClose();
@@ -2254,16 +2252,16 @@ BOOL CTaskGoto::BitmapOpen() m_bmMaxX = 0;
m_bmMaxY = 0;
- return TRUE;
+ return true;
}
// Closes the bitmap.
-BOOL CTaskGoto::BitmapClose()
+bool CTaskGoto::BitmapClose()
{
free(m_bmArray);
m_bmArray = 0;
- return TRUE;
+ return true;
}
// Puts a circle in the bitmap.
@@ -2335,10 +2333,10 @@ void CTaskGoto::BitmapClearDot(int rank, int x, int y) // Tests a point in the bitmap.
// x:y: 0..m_bmSize-1
-BOOL CTaskGoto::BitmapTestDot(int rank, int x, int y)
+bool CTaskGoto::BitmapTestDot(int rank, int x, int y)
{
if ( x < 0 || x >= m_bmSize ||
- y < 0 || y >= m_bmSize ) return FALSE;
+ y < 0 || y >= m_bmSize ) return false;
if ( x < m_bmMinX || x > m_bmMaxX ||
y < m_bmMinY || y > m_bmMaxY )
diff --git a/src/object/task/taskgoto.h b/src/object/task/taskgoto.h index ed51d3b..acd79b6 100644 --- a/src/object/task/taskgoto.h +++ b/src/object/task/taskgoto.h @@ -82,7 +82,7 @@ public: CTaskGoto(CInstanceManager* iMan, CObject* object);
~CTaskGoto();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(D3DVECTOR goal, float altitude, TaskGotoGoal goalMode, TaskGotoCrash crashMode);
Error IsEnded();
@@ -91,10 +91,10 @@ protected: CObject* WormSearch(D3DVECTOR &impact);
void WormFrame(float rTime);
CObject* SearchTarget(D3DVECTOR pos, float margin);
- BOOL AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance);
- BOOL AdjustBuilding(D3DVECTOR &pos, float margin, float &distance);
- BOOL GetHotPoint(CObject *pObj, D3DVECTOR &pos, BOOL bTake, float distance, float &suppl);
- BOOL LeakSearch(D3DVECTOR &pos, float &delay);
+ bool AdjustTarget(CObject* pObj, D3DVECTOR &pos, float &distance);
+ bool AdjustBuilding(D3DVECTOR &pos, float margin, float &distance);
+ bool GetHotPoint(CObject *pObj, D3DVECTOR &pos, bool bTake, float distance, float &suppl);
+ bool LeakSearch(D3DVECTOR &pos, float &delay);
void ComputeRepulse(FPOINT &dir);
void ComputeFlyingRepulse(float &dir);
@@ -106,17 +106,17 @@ protected: D3DVECTOR BeamPoint(const D3DVECTOR &startPoint, const D3DVECTOR &goalPoint, float angle, float step);
void BitmapDebug(const D3DVECTOR &min, const D3DVECTOR &max, const D3DVECTOR &start, const D3DVECTOR &goal);
- BOOL BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, float stepAngle, BOOL bSecond);
+ bool BitmapTestLine(const D3DVECTOR &start, const D3DVECTOR &goal, float stepAngle, bool bSecond);
void BitmapObject();
void BitmapTerrain(const D3DVECTOR &min, const D3DVECTOR &max);
void BitmapTerrain(int minx, int miny, int maxx, int maxy);
- BOOL BitmapOpen();
- BOOL BitmapClose();
+ bool BitmapOpen();
+ bool BitmapClose();
void BitmapSetCircle(const D3DVECTOR &pos, float radius);
void BitmapClearCircle(const D3DVECTOR &pos, float radius);
void BitmapSetDot(int rank, int x, int y);
void BitmapClearDot(int rank, int x, int y);
- BOOL BitmapTestDot(int rank, int x, int y);
+ bool BitmapTestDot(int rank, int x, int y);
protected:
D3DVECTOR m_goal;
@@ -128,12 +128,12 @@ protected: TaskGotoPhase m_phase;
int m_try;
Error m_error;
- BOOL m_bTake;
+ bool m_bTake;
float m_stopLength; // braking distance
float m_time;
D3DVECTOR m_pos;
- BOOL m_bWorm;
- BOOL m_bApprox;
+ bool m_bWorm;
+ bool m_bApprox;
float m_wormLastTime;
float m_lastDistance;
@@ -159,6 +159,6 @@ protected: D3DVECTOR m_leakPos; // initial position leak
float m_leakDelay;
float m_leakTime;
- BOOL m_bLeakRecede;
+ bool m_bLeakRecede;
};
diff --git a/src/object/task/taskgungoal.cpp b/src/object/task/taskgungoal.cpp index 013c3d4..5a44ade 100644 --- a/src/object/task/taskgungoal.cpp +++ b/src/object/task/taskgungoal.cpp @@ -42,7 +42,6 @@ CTaskGunGoal::CTaskGunGoal(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
}
// Object's destructor.
@@ -54,12 +53,12 @@ CTaskGunGoal::~CTaskGunGoal() // Management of an event.
-BOOL CTaskGunGoal::EventProcess(const Event &event)
+bool CTaskGunGoal::EventProcess(const Event &event)
{
float dir;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_progress += event.rTime*m_speed;
@@ -83,7 +82,7 @@ BOOL CTaskGunGoal::EventProcess(const Event &event) }
m_object->SetGunGoalH(dir);
- return TRUE;
+ return true;
}
@@ -127,7 +126,7 @@ Error CTaskGunGoal::Start(float dirV, float dirH) if ( m_finalDirV != m_initialDirV ||
m_finalDirH != m_initialDirH )
{
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.3f, 1.5f, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.3f, 1.5f, true);
m_sound->AddEnvelope(i, 0.3f, 1.5f, 1.0f/m_speed, SOPER_STOP);
}
@@ -154,8 +153,8 @@ Error CTaskGunGoal::IsEnded() // Suddenly ends the current action.
-BOOL CTaskGunGoal::Abort()
+bool CTaskGunGoal::Abort()
{
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskgungoal.h b/src/object/task/taskgungoal.h index 14e42b4..2ef8efc 100644 --- a/src/object/task/taskgungoal.h +++ b/src/object/task/taskgungoal.h @@ -35,11 +35,11 @@ public: CTaskGunGoal(CInstanceManager* iMan, CObject* object);
~CTaskGunGoal();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(float dirV, float dirH);
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index ba36cec..9897c88 100644 --- a/src/object/task/taskinfo.cpp +++ b/src/object/task/taskinfo.cpp @@ -47,7 +47,6 @@ CTaskInfo::CTaskInfo(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
}
// Object's destructor.
@@ -59,22 +58,22 @@ CTaskInfo::~CTaskInfo() // Management of an event.
-BOOL CTaskInfo::EventProcess(const Event &event)
+bool CTaskInfo::EventProcess(const Event &event)
{
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
m_progress += event.rTime*m_speed; // other advance
m_time += event.rTime;
- return TRUE;
+ return true;
}
// Assigns the goal was achieved.
-Error CTaskInfo::Start(char *name, float value, float power, BOOL bSend)
+Error CTaskInfo::Start(char *name, float value, float power, bool bSend)
{
CObject* pInfo;
CAutoInfo* pAuto;
@@ -82,7 +81,7 @@ Error CTaskInfo::Start(char *name, float value, float power, BOOL bSend) Info info;
int i, total, op;
- m_bError = TRUE;
+ m_bError = true;
m_object->SetInfoReturn(NAN);
pInfo = SearchInfo(power); // seeks terminal
@@ -167,7 +166,7 @@ Error CTaskInfo::Start(char *name, float value, float power, BOOL bSend) m_speed = 1.0f/1.0f;
m_time = 0.0f;
- m_bError = FALSE; // ok
+ m_bError = false; // ok
return ERR_OK;
}
@@ -188,9 +187,9 @@ Error CTaskInfo::IsEnded() // Suddenly ends the current action.
-BOOL CTaskInfo::Abort()
+bool CTaskInfo::Abort()
{
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskinfo.h b/src/object/task/taskinfo.h index 1461c3e..5f08f01 100644 --- a/src/object/task/taskinfo.h +++ b/src/object/task/taskinfo.h @@ -36,11 +36,11 @@ public: CTaskInfo(CInstanceManager* iMan, CObject* object);
~CTaskInfo();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
- Error Start(char *name, float value, float power, BOOL bSend);
+ Error Start(char *name, float value, float power, bool bSend);
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
CObject* SearchInfo(float power);
@@ -49,6 +49,6 @@ protected: float m_progress;
float m_speed;
float m_time;
- BOOL m_bError;
+ bool m_bError;
};
diff --git a/src/object/task/taskmanager.cpp b/src/object/task/taskmanager.cpp index 43ac2af..08ab0ce 100644 --- a/src/object/task/taskmanager.cpp +++ b/src/object/task/taskmanager.cpp @@ -63,7 +63,7 @@ CTaskManager::CTaskManager(CInstanceManager* iMan, CObject* object) m_task = 0;
m_object = object;
- m_bPilot = FALSE;
+ m_bPilot = false;
}
// Object's destructor.
@@ -149,7 +149,7 @@ Error CTaskManager::StartTaskSearch() // Reads an information terminal.
-Error CTaskManager::StartTaskInfo(char *name, float value, float power, BOOL bSend)
+Error CTaskManager::StartTaskInfo(char *name, float value, float power, bool bSend)
{
m_task = new CTaskInfo(m_iMan, m_object);
return ((CTaskInfo*)m_task)->Start(name, value, power, bSend);
@@ -165,7 +165,7 @@ Error CTaskManager::StartTaskTerraform() // Changes the pencil.
-Error CTaskManager::StartTaskPen(BOOL bDown, int color)
+Error CTaskManager::StartTaskPen(bool bDown, int color)
{
m_task = new CTaskPen(m_iMan, m_object);
return ((CTaskPen*)m_task)->Start(bDown, color);
@@ -203,7 +203,7 @@ Error CTaskManager::StartTaskShield(TaskShieldMode mode, float delay) Error CTaskManager::StartTaskFire(float delay)
{
- m_bPilot = TRUE;
+ m_bPilot = true;
m_task = new CTaskFire(m_iMan, m_object);
return ((CTaskFire*)m_task)->Start(delay);
}
@@ -246,9 +246,9 @@ Error CTaskManager::StartTaskReset(D3DVECTOR goal, D3DVECTOR angle) // Management of an event.
-BOOL CTaskManager::EventProcess(const Event &event)
+bool CTaskManager::EventProcess(const Event &event)
{
- if ( m_task == 0 ) return FALSE;
+ if ( m_task == 0 ) return false;
return m_task->EventProcess(event);
}
@@ -264,9 +264,9 @@ Error CTaskManager::IsEnded() // Indicates whether the action is pending.
-BOOL CTaskManager::IsBusy()
+bool CTaskManager::IsBusy()
{
- if ( m_task == 0 ) return FALSE;
+ if ( m_task == 0 ) return false;
return m_task->IsBusy();
}
@@ -274,7 +274,7 @@ BOOL CTaskManager::IsBusy() // Indicates whether it is possible to control the robot
// during the execution of the current task.
-BOOL CTaskManager::IsPilot()
+bool CTaskManager::IsPilot()
{
return m_bPilot;
}
@@ -282,9 +282,9 @@ BOOL CTaskManager::IsPilot() // Suddenly ends the current action.
-BOOL CTaskManager::Abort()
+bool CTaskManager::Abort()
{
- if ( m_task == 0 ) return FALSE;
+ if ( m_task == 0 ) return false;
return m_task->Abort();
}
diff --git a/src/object/task/taskmanager.h b/src/object/task/taskmanager.h index 8c7e093..476e90f 100644 --- a/src/object/task/taskmanager.h +++ b/src/object/task/taskmanager.h @@ -47,9 +47,9 @@ public: Error StartTaskFlag(TaskFlagOrder order, int rank);
Error StartTaskBuild(ObjectType type);
Error StartTaskSearch();
- Error StartTaskInfo(char *name, float value, float power, BOOL bSend);
+ Error StartTaskInfo(char *name, float value, float power, bool bSend);
Error StartTaskTerraform();
- Error StartTaskPen(BOOL bDown, int color);
+ Error StartTaskPen(bool bDown, int color);
Error StartTaskRecover();
Error StartTaskShield(TaskShieldMode mode, float delay);
Error StartTaskFire(float delay);
@@ -58,11 +58,11 @@ public: Error StartTaskSpiderExplo();
Error StartTaskReset(D3DVECTOR goal, D3DVECTOR angle);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error IsEnded();
- BOOL IsBusy();
- BOOL IsPilot();
- BOOL Abort();
+ bool IsBusy();
+ bool IsPilot();
+ bool Abort();
protected:
@@ -70,6 +70,6 @@ protected: CInstanceManager* m_iMan;
CTask* m_task;
CObject* m_object;
- BOOL m_bPilot;
+ bool m_bPilot;
};
diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 90dc016..5df067c 100644 --- a/src/object/task/taskmanip.cpp +++ b/src/object/task/taskmanip.cpp @@ -59,8 +59,6 @@ CTaskManip::CTaskManip(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
-
m_arm = TMA_NEUTRAL;
m_hand = TMH_OPEN;
}
@@ -74,19 +72,19 @@ CTaskManip::~CTaskManip() // Management of an event.
-BOOL CTaskManip::EventProcess(const Event &event)
+bool CTaskManip::EventProcess(const Event &event)
{
D3DVECTOR pos;
float angle, a, g, cirSpeed, progress;
int i;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
if ( m_bBee ) // bee?
{
- return TRUE;
+ return true;
}
if ( m_bTurn ) // preliminary rotation?
@@ -102,14 +100,14 @@ BOOL CTaskManip::EventProcess(const Event &event) if ( cirSpeed < -1.0f ) cirSpeed = -1.0f;
m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right
- return TRUE;
+ return true;
}
if ( m_move != 0 ) // preliminary advance?
{
m_timeLimit -= event.rTime;
m_physics->SetMotorSpeedX(m_move); // forward/backward
- return TRUE;
+ return true;
}
m_progress += event.rTime*m_speed; // others advance
@@ -179,7 +177,7 @@ BOOL CTaskManip::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -280,7 +278,7 @@ void CTaskManip::InitAngle() // Tests whether an object is compatible with the operation TMA_OTHER.
-BOOL TestFriend(ObjectType oType, ObjectType fType)
+bool TestFriend(ObjectType oType, ObjectType fType)
{
if ( oType == OBJECT_ENERGY )
{
@@ -320,7 +318,7 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) iAngle = NormAngle(iAngle); // 0..2*PI
oAngle = iAngle;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
if ( m_arm != TMA_FFRONT &&
m_arm != TMA_FBACK &&
@@ -360,11 +358,11 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) pyro->Create(PT_FALL, other); // the ball falls
}
- m_bBee = TRUE;
- m_bError = FALSE; // ok
+ m_bBee = true;
+ m_bError = false; // ok
return ERR_OK;
}
- m_bBee = FALSE;
+ m_bBee = false;
m_bSubm = ( type == OBJECT_MOBILEsa ); // submarine?
@@ -431,8 +429,8 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) {
if ( m_arm == TMA_FFRONT )
{
- front = SearchTakeFrontObject(TRUE, fPos, fDist, fAngle);
- other = SearchOtherObject(TRUE, oPos, oDist, oAngle, oHeight);
+ front = SearchTakeFrontObject(true, fPos, fDist, fAngle);
+ other = SearchOtherObject(true, oPos, oDist, oAngle, oHeight);
if ( front != 0 && fDist < oDist )
{
@@ -457,7 +455,7 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) }
if ( m_arm == TMA_FBACK )
{
- if ( SearchTakeBackObject(TRUE, m_targetPos, fDist, m_angle) == 0 )
+ if ( SearchTakeBackObject(true, m_targetPos, fDist, m_angle) == 0 )
{
return ERR_MANIP_NIL;
}
@@ -474,7 +472,7 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) {
if ( m_arm == TMA_FFRONT )
{
- other = SearchOtherObject(TRUE, oPos, oDist, oAngle, oHeight);
+ other = SearchOtherObject(true, oPos, oDist, oAngle, oHeight);
if ( other != 0 && other->RetPower() == 0 )
{
m_targetPos = oPos;
@@ -527,12 +525,12 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) if ( iAngle == m_angle || m_energy == 0.0f )
{
- m_bTurn = FALSE; // preliminary rotation unnecessary
+ m_bTurn = false; // preliminary rotation unnecessary
SoundManip(1.0f/m_speed);
}
else
{
- m_bTurn = TRUE; // preliminary rotation necessary
+ m_bTurn = true; // preliminary rotation necessary
}
if ( m_bSubm )
@@ -540,9 +538,9 @@ Error CTaskManip::Start(TaskManipOrder order, TaskManipArm arm) m_camera->StartCentering(m_object, PI*0.8f, 99.9f, 0.0f, 0.5f);
}
- m_physics->SetFreeze(TRUE); // it does not move
+ m_physics->SetFreeze(true); // it does not move
- m_bError = FALSE; // ok
+ m_bError = false; // ok
return ERR_OK;
}
@@ -570,7 +568,7 @@ Error CTaskManip::IsEnded() if ( TestAngle(angle, m_angle-PI*0.01f, m_angle+PI*0.01f) )
{
- m_bTurn = FALSE; // rotation ended
+ m_bTurn = false; // rotation ended
m_physics->SetMotorSpeedZ(0.0f);
if ( m_move == 0.0f )
{
@@ -704,7 +702,7 @@ Error CTaskManip::IsEnded() // Suddenly ends the current action.
-BOOL CTaskManip::Abort()
+bool CTaskManip::Abort()
{
int i;
@@ -729,8 +727,8 @@ BOOL CTaskManip::Abort() }
m_camera->StopCentering(m_object, 2.0f);
- m_physics->SetFreeze(FALSE); // is moving again
- return TRUE;
+ m_physics->SetFreeze(false); // is moving again
+ return true;
}
@@ -791,7 +789,7 @@ CObject* CTaskManip::SearchTakeUnderObject(D3DVECTOR &pos, float dLimit) // Seeks the object in front to take.
-CObject* CTaskManip::SearchTakeFrontObject(BOOL bAdvance, D3DVECTOR &pos,
+CObject* CTaskManip::SearchTakeFrontObject(bool bAdvance, D3DVECTOR &pos,
float &distance, float &angle)
{
CObject *pObj, *pBest;
@@ -883,7 +881,7 @@ CObject* CTaskManip::SearchTakeFrontObject(BOOL bAdvance, D3DVECTOR &pos, // Seeks the object back to take.
-CObject* CTaskManip::SearchTakeBackObject(BOOL bAdvance, D3DVECTOR &pos,
+CObject* CTaskManip::SearchTakeBackObject(bool bAdvance, D3DVECTOR &pos,
float &distance, float &angle)
{
CObject *pObj, *pBest;
@@ -974,7 +972,7 @@ CObject* CTaskManip::SearchTakeBackObject(BOOL bAdvance, D3DVECTOR &pos, // Seeks the robot or building on which it wants to put a battery or or other object.
-CObject* CTaskManip::SearchOtherObject(BOOL bAdvance, D3DVECTOR &pos,
+CObject* CTaskManip::SearchOtherObject(bool bAdvance, D3DVECTOR &pos,
float &distance, float &angle,
float &height)
{
@@ -1110,7 +1108,7 @@ CObject* CTaskManip::SearchOtherObject(BOOL bAdvance, D3DVECTOR &pos, // Takes the object placed in front.
-BOOL CTaskManip::TruckTakeObject()
+bool CTaskManip::TruckTakeObject()
{
CObject* fret;
CObject* other;
@@ -1121,7 +1119,7 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_GRAB ) // takes immediately?
{
fret = m_object->RetFret();
- if ( fret == 0 ) return FALSE; // nothing to take?
+ if ( fret == 0 ) return false; // nothing to take?
m_fretType = fret->RetType();
if ( m_object->RetType() == OBJECT_HUMAN ||
@@ -1163,8 +1161,8 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_FFRONT ) // takes on the ground in front?
{
- fret = SearchTakeFrontObject(FALSE, pos, dist, angle);
- if ( fret == 0 ) return FALSE; // nothing to take?
+ fret = SearchTakeFrontObject(false, pos, dist, angle);
+ if ( fret == 0 ) return false; // nothing to take?
m_fretType = fret->RetType();
if ( m_bSubm )
@@ -1195,8 +1193,8 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_FBACK ) // takes on the ground behind?
{
- fret = SearchTakeBackObject(FALSE, pos, dist, angle);
- if ( fret == 0 ) return FALSE; // nothing to take?
+ fret = SearchTakeBackObject(false, pos, dist, angle);
+ if ( fret == 0 ) return false; // nothing to take?
m_fretType = fret->RetType();
fret->SetTruck(m_object);
@@ -1214,7 +1212,7 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_POWER ) // takes battery in the back?
{
fret = m_object->RetPower();
- if ( fret == 0 ) return FALSE; // no battery?
+ if ( fret == 0 ) return false; // no battery?
m_fretType = fret->RetType();
pos = D3DVECTOR(4.7f, 0.0f, 0.0f); // relative to the hand (lem4)
@@ -1230,11 +1228,11 @@ BOOL CTaskManip::TruckTakeObject() if ( m_arm == TMA_OTHER ) // battery takes from friend?
{
- other = SearchOtherObject(FALSE, pos, dist, angle, m_height);
- if ( other == 0 ) return FALSE;
+ other = SearchOtherObject(false, pos, dist, angle, m_height);
+ if ( other == 0 ) return false;
fret = other->RetPower();
- if ( fret == 0 ) return FALSE; // the other does not have a battery?
+ if ( fret == 0 ) return false; // the other does not have a battery?
m_fretType = fret->RetType();
other->SetPower(0);
@@ -1250,12 +1248,12 @@ BOOL CTaskManip::TruckTakeObject() m_object->SetFret(fret); // takes
}
- return TRUE;
+ return true;
}
// Deposes the object taken.
-BOOL CTaskManip::TruckDeposeObject()
+bool CTaskManip::TruckDeposeObject()
{
Character* character;
CObject* fret;
@@ -1267,7 +1265,7 @@ BOOL CTaskManip::TruckDeposeObject() if ( m_arm == TMA_FFRONT ) // deposits on the ground in front?
{
fret = m_object->RetFret();
- if ( fret == 0 ) return FALSE; // nothing transported?
+ if ( fret == 0 ) return false; // nothing transported?
m_fretType = fret->RetType();
mat = fret->RetWorldMatrix(0);
@@ -1286,7 +1284,7 @@ BOOL CTaskManip::TruckDeposeObject() if ( m_arm == TMA_FBACK ) // deposited on the ground behind?
{
fret = m_object->RetFret();
- if ( fret == 0 ) return FALSE; // nothing transported?
+ if ( fret == 0 ) return false; // nothing transported?
m_fretType = fret->RetType();
mat = fret->RetWorldMatrix(0);
@@ -1304,10 +1302,10 @@ BOOL CTaskManip::TruckDeposeObject() if ( m_arm == TMA_POWER ) // deposits battery in the back?
{
fret = m_object->RetFret();
- if ( fret == 0 ) return FALSE; // nothing transported?
+ if ( fret == 0 ) return false; // nothing transported?
m_fretType = fret->RetType();
- if ( m_object->RetPower() != 0 ) return FALSE;
+ if ( m_object->RetPower() != 0 ) return false;
fret->SetTruck(m_object);
fret->SetTruckPart(0); // carried by the base
@@ -1324,14 +1322,14 @@ BOOL CTaskManip::TruckDeposeObject() if ( m_arm == TMA_OTHER ) // deposits battery on friend?
{
- other = SearchOtherObject(FALSE, pos, dist, angle, m_height);
- if ( other == 0 ) return FALSE;
+ other = SearchOtherObject(false, pos, dist, angle, m_height);
+ if ( other == 0 ) return false;
fret = other->RetPower();
- if ( fret != 0 ) return FALSE; // the other already has a battery?
+ if ( fret != 0 ) return false; // the other already has a battery?
fret = m_object->RetFret();
- if ( fret == 0 ) return FALSE;
+ if ( fret == 0 ) return false;
m_fretType = fret->RetType();
other->SetPower(fret);
@@ -1347,12 +1345,12 @@ BOOL CTaskManip::TruckDeposeObject() m_object->SetFret(0); // deposit
}
- return TRUE;
+ return true;
}
// Seeks if a location allows to deposit an object.
-BOOL CTaskManip::IsFreeDeposeObject(D3DVECTOR pos)
+bool CTaskManip::IsFreeDeposeObject(D3DVECTOR pos)
{
CObject* pObj;
D3DMATRIX* mat;
@@ -1377,11 +1375,11 @@ BOOL CTaskManip::IsFreeDeposeObject(D3DVECTOR pos) {
if ( Length(iPos, oPos)-(oRadius+1.0f) < 2.0f )
{
- return FALSE; // location occupied
+ return false; // location occupied
}
}
}
- return TRUE; // location free
+ return true; // location free
}
// Plays the sound of the manipulator arm.
@@ -1390,7 +1388,7 @@ void CTaskManip::SoundManip(float time, float amplitude, float frequency) {
int i;
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, true);
m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, 0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, time-0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.0f, 0.3f*frequency, 0.1f, SOPER_STOP);
diff --git a/src/object/task/taskmanip.h b/src/object/task/taskmanip.h index db25dd3..b2c8c29 100644 --- a/src/object/task/taskmanip.h +++ b/src/object/task/taskmanip.h @@ -64,21 +64,21 @@ public: CTaskManip(CInstanceManager* iMan, CObject* object);
~CTaskManip();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(TaskManipOrder order, TaskManipArm arm);
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
void InitAngle();
CObject* SearchTakeUnderObject(D3DVECTOR &pos, float dLimit);
- CObject* SearchTakeFrontObject(BOOL bAdvance, D3DVECTOR &pos, float &distance, float &angle);
- CObject* SearchTakeBackObject(BOOL bAdvance, D3DVECTOR &pos, float &distance, float &angle);
- CObject* SearchOtherObject(BOOL bAdvance, D3DVECTOR &pos, float &distance, float &angle, float &height);
- BOOL TruckTakeObject();
- BOOL TruckDeposeObject();
- BOOL IsFreeDeposeObject(D3DVECTOR pos);
+ CObject* SearchTakeFrontObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle);
+ CObject* SearchTakeBackObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle);
+ CObject* SearchOtherObject(bool bAdvance, D3DVECTOR &pos, float &distance, float &angle, float &height);
+ bool TruckTakeObject();
+ bool TruckDeposeObject();
+ bool IsFreeDeposeObject(D3DVECTOR pos);
void SoundManip(float time, float amplitude=1.0f, float frequency=1.0f);
protected:
@@ -93,10 +93,10 @@ protected: float m_height;
float m_advanceLength;
float m_energy;
- BOOL m_bError;
- BOOL m_bTurn;
- BOOL m_bSubm;
- BOOL m_bBee;
+ bool m_bError;
+ bool m_bTurn;
+ bool m_bSubm;
+ bool m_bBee;
float m_angle;
float m_move;
D3DVECTOR m_targetPos;
diff --git a/src/object/task/taskpen.cpp b/src/object/task/taskpen.cpp index 267c221..bd88b26 100644 --- a/src/object/task/taskpen.cpp +++ b/src/object/task/taskpen.cpp @@ -48,7 +48,6 @@ CTaskPen::CTaskPen(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
}
// Object's destructor.
@@ -60,15 +59,15 @@ CTaskPen::~CTaskPen() // Management of an event.
-BOOL CTaskPen::EventProcess(const Event &event)
+bool CTaskPen::EventProcess(const Event &event)
{
D3DVECTOR pos, speed;
FPOINT dim;
int i;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
if ( m_delay == 0.0f )
{
@@ -140,25 +139,25 @@ BOOL CTaskPen::EventProcess(const Event &event) m_object->SetPosition(10+i, pos);
}
- return TRUE;
+ return true;
}
// Assigns the goal has achieved.
-Error CTaskPen::Start(BOOL bDown, int color)
+Error CTaskPen::Start(bool bDown, int color)
{
D3DVECTOR pos;
D3DMATRIX* mat;
ObjectType type;
int i;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
type = m_object->RetType();
if ( type != OBJECT_MOBILEdr ) return ERR_FIRE_VEH;
- m_bError = FALSE; // ok
+ m_bError = false; // ok
m_oldAngle = m_object->RetAngleY(1);
m_newAngle = ColorToAngle(color);
@@ -247,10 +246,10 @@ Error CTaskPen::IsEnded() // Suddenly ends the current action.
-BOOL CTaskPen::Abort()
+bool CTaskPen::Abort()
{
//? m_camera->StopCentering(m_object, 0.5f);
- return TRUE;
+ return true;
}
@@ -260,7 +259,7 @@ void CTaskPen::SoundManip(float time, float amplitude, float frequency) {
int i;
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f*frequency, true);
m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, 0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.5f*amplitude, 1.0f*frequency, time-0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.0f, 0.3f*frequency, 0.1f, SOPER_STOP);
diff --git a/src/object/task/taskpen.h b/src/object/task/taskpen.h index 4beb9ac..2f1f270 100644 --- a/src/object/task/taskpen.h +++ b/src/object/task/taskpen.h @@ -45,11 +45,11 @@ public: CTaskPen(CInstanceManager* iMan, CObject* object);
~CTaskPen();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
- Error Start(BOOL bDown, int color);
+ Error Start(bool bDown, int color);
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
void SoundManip(float time, float amplitude, float frequency);
@@ -58,7 +58,7 @@ protected: int ColorToRank(int color);
protected:
- BOOL m_bError;
+ bool m_bError;
TaskPenPhase m_phase;
float m_progress;
float m_delay;
diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 070d429..798540b 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -50,8 +50,6 @@ CTaskRecover::CTaskRecover(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
-
m_ruin = 0;
m_soundChannel = -1;
}
@@ -65,16 +63,16 @@ CTaskRecover::~CTaskRecover() // Management of an event.
-BOOL CTaskRecover::EventProcess(const Event &event)
+bool CTaskRecover::EventProcess(const Event &event)
{
CObject* power;
D3DVECTOR pos, speed;
FPOINT dim;
float a, g, cirSpeed, angle, energy, dist, linSpeed;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
if ( m_phase == TRP_TURN ) // preliminary rotation?
{
@@ -85,7 +83,7 @@ BOOL CTaskRecover::EventProcess(const Event &event) if ( cirSpeed < -1.0f ) cirSpeed = -1.0f;
m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right
- return TRUE;
+ return true;
}
m_progress += event.rTime*m_speed; // others advance
@@ -109,7 +107,7 @@ BOOL CTaskRecover::EventProcess(const Event &event) if ( dist > RECOVER_DIST ) linSpeed = 1.0f;
if ( dist < RECOVER_DIST ) linSpeed = -1.0f;
m_physics->SetMotorSpeedX(linSpeed); // forward/backward
- return TRUE;
+ return true;
}
if ( m_phase == TRP_OPER )
@@ -178,7 +176,7 @@ BOOL CTaskRecover::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -193,7 +191,7 @@ Error CTaskRecover::Start() ObjectType type;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
if ( !m_physics->RetLand() ) return ERR_RECOVER_VEH;
type = m_object->RetType();
@@ -211,7 +209,7 @@ Error CTaskRecover::Start() m_ruin = SearchRuin();
if ( m_ruin == 0 ) return ERR_RECOVER_NULL;
- m_ruin->SetLock(TRUE); // ruin no longer usable
+ m_ruin->SetLock(true); // ruin no longer usable
iPos = m_object->RetPosition(0);
oPos = m_ruin->RetPosition(0);
@@ -225,7 +223,7 @@ Error CTaskRecover::Start() m_time = 0.0f;
m_lastParticule = 0.0f;
- m_bError = FALSE; // ok
+ m_bError = false; // ok
m_camera->StartCentering(m_object, PI*0.85f, 99.9f, 10.0f, 3.0f);
return ERR_OK;
@@ -284,7 +282,7 @@ Error CTaskRecover::IsEnded() pos = Transform(*mat, pos); // position in front
m_recoverPos = pos;
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.9f, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.9f, true);
m_sound->AddEnvelope(i, 1.0f, 1.5f, 0.3f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 1.0f, 1.5f, 1.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.0f, 0.9f, 0.3f, SOPER_STOP);
@@ -298,7 +296,7 @@ Error CTaskRecover::IsEnded() {
if ( m_progress > 1.0f ) // timeout?
{
- m_ruin->SetLock(FALSE); // usable again
+ m_ruin->SetLock(false); // usable again
m_camera->StopCentering(m_object, 2.0f);
return ERR_RECOVER_NULL;
}
@@ -317,11 +315,11 @@ Error CTaskRecover::IsEnded() delete m_metal;
m_metal = 0;
Abort();
- m_bError = TRUE;
+ m_bError = true;
m_displayText->DisplayError(ERR_TOOMANY, m_object);
return ERR_STOP;
}
- m_metal->SetLock(TRUE); // metal not yet usable
+ m_metal->SetLock(true); // metal not yet usable
m_metal->SetZoom(0, 0.0f);
mat = m_object->RetWorldMatrix(0);
@@ -332,7 +330,7 @@ Error CTaskRecover::IsEnded() m_particule->CreateRay(pos, goal, PARTIRAY2,
FPOINT(2.0f, 2.0f), 8.0f);
- m_soundChannel = m_sound->Play(SOUND_RECOVER, m_ruin->RetPosition(0), 0.0f, 1.0f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_RECOVER, m_ruin->RetPosition(0), 0.0f, 1.0f, true);
m_sound->AddEnvelope(m_soundChannel, 0.6f, 1.0f, 2.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.6f, 1.0f, 4.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.7f, 2.0f, SOPER_STOP);
@@ -352,7 +350,7 @@ Error CTaskRecover::IsEnded() m_soundChannel = -1;
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.9f, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.9f, true);
m_sound->AddEnvelope(i, 1.0f, 1.5f, 0.3f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 1.0f, 1.5f, 1.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.0f, 0.9f, 0.3f, SOPER_STOP);
@@ -362,7 +360,7 @@ Error CTaskRecover::IsEnded() return ERR_CONTINUE;
}
- m_metal->SetLock(FALSE); // metal usable
+ m_metal->SetLock(false); // metal usable
Abort();
return ERR_STOP;
@@ -370,7 +368,7 @@ Error CTaskRecover::IsEnded() // Suddenly ends the current action.
-BOOL CTaskRecover::Abort()
+bool CTaskRecover::Abort()
{
m_object->SetAngleZ(2, 126.0f*PI/180.0f);
m_object->SetAngleZ(4, 126.0f*PI/180.0f);
@@ -385,7 +383,7 @@ BOOL CTaskRecover::Abort() }
m_camera->StopCentering(m_object, 2.0f);
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskrecover.h b/src/object/task/taskrecover.h index d8625ad..87efc07 100644 --- a/src/object/task/taskrecover.h +++ b/src/object/task/taskrecover.h @@ -47,11 +47,11 @@ public: CTaskRecover(CInstanceManager* iMan, CObject* object);
~CTaskRecover();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start();
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
CObject* SearchRuin();
@@ -63,7 +63,7 @@ protected: float m_time;
float m_angle;
float m_lastParticule;
- BOOL m_bError;
+ bool m_bError;
CObject* m_ruin;
CObject* m_metal;
D3DVECTOR m_recoverPos;
diff --git a/src/object/task/taskreset.cpp b/src/object/task/taskreset.cpp index 5616c0c..1b7ff95 100644 --- a/src/object/task/taskreset.cpp +++ b/src/object/task/taskreset.cpp @@ -52,7 +52,6 @@ CTaskReset::CTaskReset(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
}
// Object's destructor.
@@ -64,15 +63,15 @@ CTaskReset::~CTaskReset() // Management of an event.
-BOOL CTaskReset::EventProcess(const Event &event)
+bool CTaskReset::EventProcess(const Event &event)
{
D3DVECTOR pos, speed;
FPOINT dim;
float angle, duration;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
m_time += event.rTime;
m_progress += event.rTime*m_speed;
@@ -171,7 +170,7 @@ BOOL CTaskReset::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -196,7 +195,7 @@ Error CTaskReset::Start(D3DVECTOR goal, D3DVECTOR angle) m_object->SetAngle(0, angle);
m_brain->RunProgram(m_object->RetResetRun());
- m_bError = FALSE;
+ m_bError = false;
return ERR_OK;
}
@@ -206,7 +205,7 @@ Error CTaskReset::Start(D3DVECTOR goal, D3DVECTOR angle) if ( SearchVehicle() ) // starting location occupied?
{
- m_bError = TRUE;
+ m_bError = true;
return ERR_RESET_NEAR;
}
@@ -217,12 +216,12 @@ Error CTaskReset::Start(D3DVECTOR goal, D3DVECTOR angle) m_progress = 0.0f;
m_lastParticule = 0.0f;
- m_object->SetResetBusy(TRUE);
+ m_object->SetResetBusy(true);
- i = m_sound->Play(SOUND_GGG, m_begin, 1.0f, 2.0f, TRUE);
+ i = m_sound->Play(SOUND_GGG, m_begin, 1.0f, 2.0f, true);
m_sound->AddEnvelope(i, 0.0f, 0.5f, RESET_DELAY_ZOOM, SOPER_STOP);
- m_bError = FALSE;
+ m_bError = false;
return ERR_OK;
}
@@ -257,7 +256,7 @@ Error CTaskReset::IsEnded() m_object->SetPosition(0, m_goal);
m_object->SetAngle(0, m_angle);
- i = m_sound->Play(SOUND_GGG, m_goal, 1.0f, 0.5f, TRUE);
+ i = m_sound->Play(SOUND_GGG, m_goal, 1.0f, 0.5f, true);
m_sound->AddEnvelope(i, 0.0f, 2.0f, RESET_DELAY_ZOOM, SOPER_STOP);
m_phase = TRSP_ZIN;
@@ -276,14 +275,14 @@ Error CTaskReset::IsEnded() }
m_brain->RunProgram(m_object->RetResetRun());
- m_object->SetResetBusy(FALSE);
+ m_object->SetResetBusy(false);
return ERR_STOP;
}
// Seeks if a vehicle is too close.
-BOOL CTaskReset::SearchVehicle()
+bool CTaskReset::SearchVehicle()
{
CObject* pObj;
D3DVECTOR oPos;
@@ -337,9 +336,9 @@ BOOL CTaskReset::SearchVehicle() if ( !pObj->GetCrashSphere(0, oPos, oRadius) ) continue;
dist = Length(oPos, m_goal)-oRadius;
- if ( dist < 5.0f ) return TRUE;
+ if ( dist < 5.0f ) return true;
}
- return FALSE;
+ return false;
}
diff --git a/src/object/task/taskreset.h b/src/object/task/taskreset.h index 6665bce..4ebc032 100644 --- a/src/object/task/taskreset.h +++ b/src/object/task/taskreset.h @@ -46,13 +46,13 @@ public: CTaskReset(CInstanceManager* iMan, CObject* object);
~CTaskReset();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(D3DVECTOR goal, D3DVECTOR angle);
Error IsEnded();
protected:
- BOOL SearchVehicle();
+ bool SearchVehicle();
protected:
D3DVECTOR m_begin;
@@ -60,7 +60,7 @@ protected: D3DVECTOR m_angle;
TaskResetPhase m_phase;
- BOOL m_bError;
+ bool m_bError;
float m_time;
float m_speed;
float m_progress;
diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 7007691..f182250 100644 --- a/src/object/task/tasksearch.cpp +++ b/src/object/task/tasksearch.cpp @@ -47,8 +47,6 @@ CTaskSearch::CTaskSearch(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
-
m_hand = TSH_UP;
}
@@ -61,7 +59,7 @@ CTaskSearch::~CTaskSearch() // Management of an event.
-BOOL CTaskSearch::EventProcess(const Event &event)
+bool CTaskSearch::EventProcess(const Event &event)
{
D3DMATRIX* mat;
D3DVECTOR pos, speed;
@@ -69,9 +67,9 @@ BOOL CTaskSearch::EventProcess(const Event &event) float angle;
int i;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
m_progress += event.rTime*m_speed; // others advance
m_time += event.rTime;
@@ -104,7 +102,7 @@ BOOL CTaskSearch::EventProcess(const Event &event) m_particule->CreateParticule(pos, speed, dim, PARTIGAS);
}
- return TRUE;
+ return true;
}
@@ -142,7 +140,7 @@ Error CTaskSearch::Start() D3DVECTOR speed;
int i;
- m_bError = TRUE;
+ m_bError = true;
if ( !m_physics->RetLand() ) return ERR_SEARCH_FLY;
speed = m_physics->RetMotorSpeed();
@@ -163,16 +161,16 @@ Error CTaskSearch::Start() m_lastParticule = 0.0f;
InitAngle();
- m_bError = FALSE; // ok
+ m_bError = false; // ok
m_camera->StartCentering(m_object, PI*0.50f, 99.9f, 0.0f, 1.0f);
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, true);
m_sound->AddEnvelope(i, 0.5f, 1.0f, 0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.5f, 1.0f, 0.9f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.0f, 0.3f, 0.1f, SOPER_STOP);
- m_physics->SetFreeze(TRUE); // it does not move
+ m_physics->SetFreeze(true); // it does not move
return ERR_OK;
}
@@ -214,7 +212,7 @@ Error CTaskSearch::IsEnded() m_hand = TSH_UP;
InitAngle();
- i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, TRUE);
+ i = m_sound->Play(SOUND_MANIP, m_object->RetPosition(0), 0.0f, 0.3f, true);
m_sound->AddEnvelope(i, 0.5f, 1.0f, 0.1f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.5f, 1.0f, 0.9f, SOPER_CONTINUE);
m_sound->AddEnvelope(i, 0.0f, 0.3f, 0.1f, SOPER_STOP);
@@ -230,17 +228,17 @@ Error CTaskSearch::IsEnded() // Suddenly ends the current action.
-BOOL CTaskSearch::Abort()
+bool CTaskSearch::Abort()
{
m_camera->StopCentering(m_object, 2.0f);
- m_physics->SetFreeze(FALSE); // is moving again
- return TRUE;
+ m_physics->SetFreeze(false); // is moving again
+ return true;
}
// Creates a mark if possible.
-BOOL CTaskSearch::CreateMark()
+bool CTaskSearch::CreateMark()
{
CObject* fret;
ObjectType type;
@@ -254,7 +252,7 @@ BOOL CTaskSearch::CreateMark() pos = Transform(*mat, pos); // sensor position
res = m_terrain->RetResource(pos);
- if ( res == TR_NULL ) return FALSE;
+ if ( res == TR_NULL ) return false;
type = OBJECT_NULL;
if ( res == TR_STONE )
@@ -292,7 +290,7 @@ BOOL CTaskSearch::CreateMark() type = OBJECT_MARKKEYd;
info = INFO_MARKKEYd;
}
- if ( type == OBJECT_NULL ) return FALSE;
+ if ( type == OBJECT_NULL ) return false;
//? DeleteMark(type);
@@ -301,12 +299,12 @@ BOOL CTaskSearch::CreateMark() {
delete fret;
m_displayText->DisplayError(ERR_TOOMANY, m_object);
- return FALSE;
+ return false;
}
m_displayText->DisplayError(info, pos, 5.0f, 50.0f); // displays the message
- return TRUE;
+ return true;
}
// Destroys the marks of a given type.
diff --git a/src/object/task/tasksearch.h b/src/object/task/tasksearch.h index 18254cc..48b1a32 100644 --- a/src/object/task/tasksearch.h +++ b/src/object/task/tasksearch.h @@ -51,15 +51,15 @@ public: CTaskSearch(CInstanceManager* iMan, CObject* object);
~CTaskSearch();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start();
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
void InitAngle();
- BOOL CreateMark();
+ bool CreateMark();
void DeleteMark(ObjectType type);
protected:
@@ -71,6 +71,6 @@ protected: float m_lastParticule;
float m_initialAngle[3];
float m_finalAngle[3];
- BOOL m_bError;
+ bool m_bError;
};
diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index 03cc571..818a3a7 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -50,8 +50,6 @@ CTaskShield::CTaskShield(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
-
m_rankSphere = -1;
m_soundChannel = -1;
m_effectLight = -1;
@@ -67,7 +65,7 @@ CTaskShield::~CTaskShield() // Management of an event.
-BOOL CTaskShield::EventProcess(const Event &event)
+bool CTaskShield::EventProcess(const Event &event)
{
CObject* power;
D3DMATRIX* mat;
@@ -77,9 +75,9 @@ BOOL CTaskShield::EventProcess(const Event &event) FPOINT dim;
float energy;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
m_progress += event.rTime*m_speed; // others advance
m_time += event.rTime;
@@ -127,7 +125,7 @@ BOOL CTaskShield::EventProcess(const Event &event) if ( m_soundChannel == -1 )
{
- m_soundChannel = m_sound->Play(SOUND_SHIELD, m_shieldPos, 0.5f, 0.5f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_SHIELD, m_shieldPos, 0.5f, 0.5f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 2.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 1.0f, SOPER_LOOP);
}
@@ -232,7 +230,7 @@ BOOL CTaskShield::EventProcess(const Event &event) m_object->SetPosition(2, pos);
}
- return TRUE;
+ return true;
}
@@ -264,7 +262,7 @@ Error CTaskShield::Start(TaskShieldMode mode, float delay) type = m_object->RetType();
if ( type != OBJECT_MOBILErs ) return ERR_SHIELD_VEH;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
if ( !m_physics->RetLand() ) return ERR_SHIELD_VEH;
power = m_object->RetPower();
@@ -289,7 +287,7 @@ Error CTaskShield::Start(TaskShieldMode mode, float delay) m_lastIncrease = 0.0f;
m_energyUsed = 0.0f;
- m_bError = FALSE; // ok
+ m_bError = false; // ok
if ( m_object->RetSelect() )
{
@@ -439,19 +437,19 @@ Error CTaskShield::IsEnded() // Indicates whether the action is pending.
-BOOL CTaskShield::IsBusy()
+bool CTaskShield::IsBusy()
{
if ( m_phase == TS_SHIELD )
{
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
// Suddenly ends the current action.
-BOOL CTaskShield::Abort()
+bool CTaskShield::Abort()
{
D3DVECTOR pos;
@@ -487,17 +485,17 @@ BOOL CTaskShield::Abort() }
m_camera->StopCentering(m_object, 2.0f);
- return TRUE;
+ return true;
}
// Creates the light to accompany a pyrotechnic effect.
-BOOL CTaskShield::CreateLight(D3DVECTOR pos)
+bool CTaskShield::CreateLight(D3DVECTOR pos)
{
D3DLIGHT7 light;
- if ( !m_engine->RetLightMode() ) return TRUE;
+ if ( !m_engine->RetLightMode() ) return true;
ZeroMemory( &light, sizeof(light) );
light.dltType = D3DLIGHT_SPOT;
@@ -519,12 +517,12 @@ BOOL CTaskShield::CreateLight(D3DVECTOR pos) light.dvPhi = PI/4.0f;
m_effectLight = m_light->CreateLight();
- if ( m_effectLight == -1 ) return FALSE;
+ if ( m_effectLight == -1 ) return false;
m_light->SetLight(m_effectLight, light);
m_light->SetLightIntensity(m_effectLight, 1.0f);
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskshield.h b/src/object/task/taskshield.h index 6fa1540..e78466e 100644 --- a/src/object/task/taskshield.h +++ b/src/object/task/taskshield.h @@ -59,16 +59,16 @@ public: CTaskShield(CInstanceManager* iMan, CObject* object);
~CTaskShield();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(TaskShieldMode mode, float delay);
Error IsEnded();
- BOOL IsBusy();
- BOOL Abort();
+ bool IsBusy();
+ bool Abort();
protected:
Error Stop();
- BOOL CreateLight(D3DVECTOR pos);
+ bool CreateLight(D3DVECTOR pos);
void IncreaseShield();
float RetRadius();
@@ -82,7 +82,7 @@ protected: float m_lastRay;
float m_lastIncrease;
float m_energyUsed;
- BOOL m_bError;
+ bool m_bError;
D3DVECTOR m_shieldPos;
int m_rankSphere;
int m_soundChannel;
diff --git a/src/object/task/taskspiderexplo.cpp b/src/object/task/taskspiderexplo.cpp index 2f7717c..496916c 100644 --- a/src/object/task/taskspiderexplo.cpp +++ b/src/object/task/taskspiderexplo.cpp @@ -45,10 +45,8 @@ CTaskSpiderExplo::CTaskSpiderExplo(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
-
m_time = 0.0f;
- m_bError = FALSE;
+ m_bError = false;
}
// Object's destructor.
@@ -60,21 +58,21 @@ CTaskSpiderExplo::~CTaskSpiderExplo() // Management of an event.
-BOOL CTaskSpiderExplo::EventProcess(const Event &event)
+bool CTaskSpiderExplo::EventProcess(const Event &event)
{
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
// Momentarily stationary object (ant on the back)?
if ( m_object->RetFixed() )
{
- m_bError = TRUE;
- return TRUE;
+ m_bError = true;
+ return true;
}
m_time += event.rTime;
- return TRUE;
+ return true;
}
@@ -88,7 +86,7 @@ Error CTaskSpiderExplo::Start() m_physics->SetMotorSpeedX(0.0f); // stops the advance
m_physics->SetMotorSpeedZ(0.0f); // stops the rotation
- m_bError = FALSE;
+ m_bError = false;
return ERR_OK;
}
@@ -117,8 +115,8 @@ Error CTaskSpiderExplo::IsEnded() // Suddenly ends the current action.
-BOOL CTaskSpiderExplo::Abort()
+bool CTaskSpiderExplo::Abort()
{
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskspiderexplo.h b/src/object/task/taskspiderexplo.h index 3e68279..a08e9dd 100644 --- a/src/object/task/taskspiderexplo.h +++ b/src/object/task/taskspiderexplo.h @@ -35,16 +35,16 @@ public: CTaskSpiderExplo(CInstanceManager* iMan, CObject* object);
~CTaskSpiderExplo();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start();
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
protected:
float m_time;
- BOOL m_bError;
+ bool m_bError;
};
diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index 912033f..b09366a 100644 --- a/src/object/task/tasktake.cpp +++ b/src/object/task/tasktake.cpp @@ -52,8 +52,6 @@ CTaskTake::CTaskTake(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
-
m_terrain = (CTerrain*)m_iMan->SearchInstance(CLASS_TERRAIN);
m_arm = TTA_NEUTRAL;
@@ -68,13 +66,13 @@ CTaskTake::~CTaskTake() // Management of an event.
-BOOL CTaskTake::EventProcess(const Event &event)
+bool CTaskTake::EventProcess(const Event &event)
{
float a, g, cirSpeed;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
if ( m_bTurn ) // preliminary rotation?
{
@@ -85,14 +83,14 @@ BOOL CTaskTake::EventProcess(const Event &event) if ( cirSpeed < -1.0f ) cirSpeed = -1.0f;
m_physics->SetMotorSpeedZ(cirSpeed); // turns left / right
- return TRUE;
+ return true;
}
m_progress += event.rTime*m_speed; // others advance
m_physics->SetMotorSpeed(D3DVECTOR(0.0f, 0.0f, 0.0f)); // immobile!
- return TRUE;
+ return true;
}
@@ -113,7 +111,7 @@ Error CTaskTake::Start() iAngle = NormAngle(iAngle); // 0..2*PI
oAngle = iAngle;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
if ( !m_physics->RetLand() )
{
pos = m_object->RetPosition(0);
@@ -195,12 +193,12 @@ Error CTaskTake::Start() }
}
- m_bTurn = TRUE; // preliminary rotation necessary
+ m_bTurn = true; // preliminary rotation necessary
m_angle = oAngle; // angle was reached
- m_physics->SetFreeze(TRUE); // it does not move
+ m_physics->SetFreeze(true); // it does not move
- m_bError = FALSE; // ok
+ m_bError = false; // ok
return ERR_OK;
}
@@ -221,7 +219,7 @@ Error CTaskTake::IsEnded() if ( TestAngle(angle, m_angle-PI*0.01f, m_angle+PI*0.01f) )
{
- m_bTurn = FALSE; // rotation ended
+ m_bTurn = false; // rotation ended
m_physics->SetMotorSpeedZ(0.0f);
if ( m_arm == TTA_FFRONT )
@@ -301,12 +299,12 @@ Error CTaskTake::IsEnded() // Suddenly ends the current action.
-BOOL CTaskTake::Abort()
+bool CTaskTake::Abort()
{
m_motion->SetAction(-1);
m_camera->StopCentering(m_object, 0.8f);
- m_physics->SetFreeze(FALSE); // is moving again
- return TRUE;
+ m_physics->SetFreeze(false); // is moving again
+ return true;
}
@@ -467,7 +465,7 @@ CObject* CTaskTake::SearchFriendObject(float &angle, // Takes the object in front.
-BOOL CTaskTake::TruckTakeObject()
+bool CTaskTake::TruckTakeObject()
{
CObject* fret;
CObject* other;
@@ -478,7 +476,7 @@ BOOL CTaskTake::TruckTakeObject() {
//? fret = SearchTakeObject(angle, 1.5f, PI*0.04f);
fret = SearchTakeObject(angle, 1.5f, PI*0.15f); //OK 1.9
- if ( fret == 0 ) return FALSE; // rien � prendre ?
+ if ( fret == 0 ) return false; // rien � prendre ?
m_fretType = fret->RetType();
fret->SetTruck(m_object);
@@ -496,10 +494,10 @@ BOOL CTaskTake::TruckTakeObject() if ( m_arm == TTA_FRIEND ) // takes friend's battery?
{
other = SearchFriendObject(angle, 1.5f, PI*0.04f);
- if ( other == 0 ) return FALSE;
+ if ( other == 0 ) return false;
fret = other->RetPower();
- if ( fret == 0 ) return FALSE; // the other does not have a battery?
+ if ( fret == 0 ) return false; // the other does not have a battery?
m_fretType = fret->RetType();
other->SetPower(0);
@@ -515,12 +513,12 @@ BOOL CTaskTake::TruckTakeObject() m_object->SetFret(fret); // takes
}
- return TRUE;
+ return true;
}
// Deposes the object taken.
-BOOL CTaskTake::TruckDeposeObject()
+bool CTaskTake::TruckDeposeObject()
{
Character* character;
CObject* fret;
@@ -532,7 +530,7 @@ BOOL CTaskTake::TruckDeposeObject() if ( m_arm == TTA_FFRONT ) // deposes on the ground in front?
{
fret = m_object->RetFret();
- if ( fret == 0 ) return FALSE; // does nothing?
+ if ( fret == 0 ) return false; // does nothing?
m_fretType = fret->RetType();
mat = fret->RetWorldMatrix(0);
@@ -551,13 +549,13 @@ BOOL CTaskTake::TruckDeposeObject() if ( m_arm == TTA_FRIEND ) // deposes battery on friends?
{
other = SearchFriendObject(angle, 1.5f, PI*0.04f);
- if ( other == 0 ) return FALSE;
+ if ( other == 0 ) return false;
fret = other->RetPower();
- if ( fret != 0 ) return FALSE; // the other already has a battery?
+ if ( fret != 0 ) return false; // the other already has a battery?
fret = m_object->RetFret();
- if ( fret == 0 ) return FALSE;
+ if ( fret == 0 ) return false;
m_fretType = fret->RetType();
other->SetPower(fret);
@@ -573,12 +571,12 @@ BOOL CTaskTake::TruckDeposeObject() m_object->SetFret(0); // deposit
}
- return TRUE;
+ return true;
}
// Seeks if a location allows to deposit an object.
-BOOL CTaskTake::IsFreeDeposeObject(D3DVECTOR pos)
+bool CTaskTake::IsFreeDeposeObject(D3DVECTOR pos)
{
CObject* pObj;
D3DMATRIX* mat;
@@ -603,11 +601,11 @@ BOOL CTaskTake::IsFreeDeposeObject(D3DVECTOR pos) {
if ( Length(iPos, oPos)-(oRadius+1.0f) < 1.0f )
{
- return FALSE; // location occupied
+ return false; // location occupied
}
}
}
- return TRUE; // location free
+ return true; // location free
}
diff --git a/src/object/task/tasktake.h b/src/object/task/tasktake.h index 31ccfef..f94c366 100644 --- a/src/object/task/tasktake.h +++ b/src/object/task/tasktake.h @@ -52,18 +52,18 @@ public: CTaskTake(CInstanceManager* iMan, CObject* object);
~CTaskTake();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start();
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
CObject* SearchTakeObject(float &angle, float dLimit, float aLimit);
CObject* SearchFriendObject(float &angle, float dLimit, float aLimit);
- BOOL TruckTakeObject();
- BOOL TruckDeposeObject();
- BOOL IsFreeDeposeObject(D3DVECTOR pos);
+ bool TruckTakeObject();
+ bool TruckDeposeObject();
+ bool IsFreeDeposeObject(D3DVECTOR pos);
protected:
CTerrain* m_terrain;
@@ -74,8 +74,8 @@ protected: float m_speed;
float m_progress;
float m_height;
- BOOL m_bError;
- BOOL m_bTurn;
+ bool m_bError;
+ bool m_bTurn;
float m_angle;
ObjectType m_fretType;
};
diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 9e07e05..a3403f0 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -54,7 +54,6 @@ CTaskTerraform::CTaskTerraform(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
m_lastParticule = 0.0f;
m_soundChannel = -1;
}
@@ -68,7 +67,7 @@ CTaskTerraform::~CTaskTerraform() // Management of an event.
-BOOL CTaskTerraform::EventProcess(const Event &event)
+bool CTaskTerraform::EventProcess(const Event &event)
{
CObject* power;
D3DMATRIX* mat;
@@ -76,9 +75,9 @@ BOOL CTaskTerraform::EventProcess(const Event &event) FPOINT dim;
float energy;
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
- if ( m_bError ) return FALSE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
+ if ( m_bError ) return false;
m_progress += event.rTime*m_speed; // others advance
m_time += event.rTime;
@@ -88,11 +87,11 @@ BOOL CTaskTerraform::EventProcess(const Event &event) if ( m_soundChannel == -1 )
{
#if _TEEN
- m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 2.0f, 1.5f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 0.5f, SOPER_STOP);
#else
- m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_GGG, m_object->RetPosition(0), 1.0f, 0.5f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 2.0f, 4.0f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 0.0f, 0.5f, 0.5f, SOPER_STOP);
#endif
@@ -204,7 +203,7 @@ BOOL CTaskTerraform::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -219,7 +218,7 @@ Error CTaskTerraform::Start() ObjectType type;
- m_bError = TRUE; // operation impossible
+ m_bError = true; // operation impossible
if ( !m_physics->RetLand() ) return ERR_TERRA_VEH;
type = m_object->RetType();
@@ -248,7 +247,7 @@ Error CTaskTerraform::Start() #endif
m_time = 0.0f;
- m_bError = FALSE; // ok
+ m_bError = false; // ok
m_camera->StartCentering(m_object, PI*0.35f, 99.9f, 20.0f, 2.0f);
return ERR_OK;
@@ -340,7 +339,7 @@ Error CTaskTerraform::IsEnded() // Suddenly ends the current action.
-BOOL CTaskTerraform::Abort()
+bool CTaskTerraform::Abort()
{
CObject* power;
@@ -363,13 +362,13 @@ BOOL CTaskTerraform::Abort() }
m_camera->StopCentering(m_object, 2.0f);
- return TRUE;
+ return true;
}
// Returns all the close ants and spiders.
-BOOL CTaskTerraform::Terraform()
+bool CTaskTerraform::Terraform()
{
CObject* pObj;
CBrain* brain;
@@ -412,18 +411,18 @@ BOOL CTaskTerraform::Terraform() brain = pObj->RetBrain();
if ( brain != 0 ) brain->StopTask();
motion->SetAction(MAS_BACK1, 0.8f+Rand()*0.3f);
- pObj->SetFixed(TRUE); // not moving
+ pObj->SetFixed(true); // not moving
}
if ( type == OBJECT_SPIDER )
{
brain = pObj->RetBrain();
if ( brain != 0 ) brain->StopTask();
motion->SetAction(MSS_BACK1, 0.8f+Rand()*0.3f);
- pObj->SetFixed(TRUE); // not moving
+ pObj->SetFixed(true); // not moving
}
}
}
- return TRUE;
+ return true;
}
diff --git a/src/object/task/taskterraform.h b/src/object/task/taskterraform.h index bc66c66..dfb3488 100644 --- a/src/object/task/taskterraform.h +++ b/src/object/task/taskterraform.h @@ -47,14 +47,14 @@ public: CTaskTerraform(CInstanceManager* iMan, CObject* object);
~CTaskTerraform();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start();
Error IsEnded();
- BOOL Abort();
+ bool Abort();
protected:
- BOOL Terraform();
+ bool Terraform();
protected:
TaskTerraPhase m_phase;
@@ -63,7 +63,7 @@ protected: float m_time;
float m_lastParticule;
int m_soundChannel;
- BOOL m_bError;
+ bool m_bError;
D3DVECTOR m_terraPos;
};
diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index d75f9d1..35f1eb9 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -44,7 +44,6 @@ CTaskTurn::CTaskTurn(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
}
// Object's destructor.
@@ -56,21 +55,21 @@ CTaskTurn::~CTaskTurn() // Management of an event.
-BOOL CTaskTurn::EventProcess(const Event &event)
+bool CTaskTurn::EventProcess(const Event &event)
{
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
// Momentarily stationary object (ant on the back)?
if ( m_object->RetFixed() )
{
m_physics->SetMotorSpeedX(0.0f); // stops the advance
m_physics->SetMotorSpeedZ(0.0f); // stops the rotation
- m_bError = TRUE;
- return TRUE;
+ m_bError = true;
+ return true;
}
- return TRUE;
+ return true;
}
@@ -86,18 +85,18 @@ Error CTaskTurn::Start(float angle) {
m_angle = angle+m_physics->RetCirStopLength();
m_physics->SetMotorSpeedZ(-1.0f); // turns left
- m_bLeft = TRUE;
+ m_bLeft = true;
}
else
{
m_angle = angle-m_physics->RetCirStopLength();
m_physics->SetMotorSpeedZ(1.0f); // turns right
- m_bLeft = FALSE;
+ m_bLeft = false;
}
m_physics->SetMotorSpeedX(0.0f);
m_physics->SetMotorSpeedY(0.0f);
- m_bError = FALSE;
+ m_bError = false;
return ERR_OK;
}
diff --git a/src/object/task/taskturn.h b/src/object/task/taskturn.h index 27cba98..b9a432b 100644 --- a/src/object/task/taskturn.h +++ b/src/object/task/taskturn.h @@ -35,7 +35,7 @@ public: CTaskTurn(CInstanceManager* iMan, CObject* object);
~CTaskTurn();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(float angle);
Error IsEnded();
@@ -46,7 +46,7 @@ protected: float m_angle;
float m_startAngle;
float m_finalAngle;
- BOOL m_bLeft;
- BOOL m_bError;
+ bool m_bLeft;
+ bool m_bError;
};
diff --git a/src/object/task/taskwait.cpp b/src/object/task/taskwait.cpp index 7560e9a..64883c1 100644 --- a/src/object/task/taskwait.cpp +++ b/src/object/task/taskwait.cpp @@ -44,7 +44,6 @@ CTaskWait::CTaskWait(CInstanceManager* iMan, CObject* object)
: CTask(iMan, object)
{
- CTask::CTask(iMan, object);
}
// Object's destructor.
@@ -56,14 +55,14 @@ CTaskWait::~CTaskWait() // Management of an event.
-BOOL CTaskWait::EventProcess(const Event &event)
+bool CTaskWait::EventProcess(const Event &event)
{
- if ( m_engine->RetPause() ) return TRUE;
- if ( event.event != EVENT_FRAME ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
+ if ( event.event != EVENT_FRAME ) return true;
m_passTime += event.rTime;
m_bEnded = (m_passTime >= m_waitTime);
- return TRUE;
+ return true;
}
@@ -73,7 +72,7 @@ Error CTaskWait::Start(float time) {
m_waitTime = time; // duration to wait
m_passTime = 0.0f; // time elapsed
- m_bEnded = FALSE;
+ m_bEnded = false;
return ERR_OK;
}
diff --git a/src/object/task/taskwait.h b/src/object/task/taskwait.h index 7a33f49..25e8e67 100644 --- a/src/object/task/taskwait.h +++ b/src/object/task/taskwait.h @@ -35,7 +35,7 @@ public: CTaskWait(CInstanceManager* iMan, CObject* object);
~CTaskWait();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
Error Start(float time);
Error IsEnded();
@@ -45,6 +45,6 @@ protected: protected:
float m_waitTime;
float m_passTime;
- BOOL m_bEnded;
+ bool m_bEnded;
};
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index bc73c74..eb26d6e 100644 --- a/src/physics/physics.cpp +++ b/src/physics/physics.cpp @@ -79,11 +79,11 @@ CPhysics::CPhysics(CInstanceManager* iMan, CObject* object) m_time = 0.0f;
m_timeUnderWater = 0.0f;
m_motorSpeed = D3DVECTOR(0.0f, 0.0f, 0.0f);
- m_bMotor = FALSE;
- m_bLand = TRUE; // ground
- m_bSwim = FALSE; // in air
- m_bCollision = FALSE;
- m_bObstacle = FALSE;
+ m_bMotor = false;
+ m_bLand = true; // ground
+ m_bSwim = false; // in air
+ m_bCollision = false;
+ m_bObstacle = false;
m_repeatCollision = 0;
m_linVibrationFactor = 1.0f;
m_cirVibrationFactor = 1.0f;
@@ -95,7 +95,7 @@ CPhysics::CPhysics(CInstanceManager* iMan, CObject* object) m_lastUnderParticule = 0.0f;
m_lastPloufParticule = 0.0f;
m_lastFlameParticule = 0.0f;
- m_bWheelParticuleBrake = FALSE;
+ m_bWheelParticuleBrake = false;
m_absorbWater = 0.0f;
m_reactorTemperature = 0.0f;
m_reactorRange = 1.0f;
@@ -110,10 +110,10 @@ CPhysics::CPhysics(CInstanceManager* iMan, CObject* object) m_soundTimePshhh = 0.0f;
m_soundTimeJostle = 0.0f;
m_soundTimeBoum = 0.0f;
- m_bSoundSlow = TRUE;
- m_bFreeze = FALSE;
- m_bForceUpdate = TRUE;
- m_bLowLevel = FALSE;
+ m_bSoundSlow = true;
+ m_bFreeze = false;
+ m_bForceUpdate = true;
+ m_bLowLevel = false;
ZeroMemory(&m_linMotion, sizeof(Motion));
ZeroMemory(&m_cirMotion, sizeof(Motion));
@@ -129,7 +129,7 @@ CPhysics::~CPhysics() // Destroys the object.
-void CPhysics::DeleteObject(BOOL bAll)
+void CPhysics::DeleteObject(bool bAll)
{
if ( m_soundChannel != -1 )
{
@@ -173,7 +173,7 @@ PhysicsType CPhysics::RetType() // Saves all parameters of the object.
-BOOL CPhysics::Write(char *line)
+bool CPhysics::Write(char *line)
{
char name[100];
@@ -189,12 +189,12 @@ BOOL CPhysics::Write(char *line) strcat(line, name);
}
- return TRUE;
+ return true;
}
// Restores all parameters of the object.
-BOOL CPhysics::Read(char *line)
+bool CPhysics::Read(char *line)
{
m_motorSpeed = OpDir(line, "motor");
@@ -204,7 +204,7 @@ BOOL CPhysics::Read(char *line) SetLand(OpInt(line, "land", 0));
}
- return TRUE;
+ return true;
}
@@ -232,7 +232,7 @@ float CPhysics::RetFloorHeight() // Managing the state of the engine.
-void CPhysics::SetMotor(BOOL bState)
+void CPhysics::SetMotor(bool bState)
{
int light;
@@ -246,7 +246,7 @@ void CPhysics::SetMotor(BOOL bState) }
}
-BOOL CPhysics::RetMotor()
+bool CPhysics::RetMotor()
{
return m_bMotor;
}
@@ -254,13 +254,13 @@ BOOL CPhysics::RetMotor() // Management of the state in flight/ground.
-void CPhysics::SetLand(BOOL bState)
+void CPhysics::SetLand(bool bState)
{
m_bLand = bState;
SetMotor(!bState); // lights if you leave the reactor in flight
}
-BOOL CPhysics::RetLand()
+bool CPhysics::RetLand()
{
return m_bLand;
}
@@ -268,7 +268,7 @@ BOOL CPhysics::RetLand() // Management of the state in air/water.
-void CPhysics::SetSwim(BOOL bState)
+void CPhysics::SetSwim(bool bState)
{
if ( !m_bSwim && bState ) // enters the water?
{
@@ -277,7 +277,7 @@ void CPhysics::SetSwim(BOOL bState) m_bSwim = bState;
}
-BOOL CPhysics::RetSwim()
+bool CPhysics::RetSwim()
{
return m_bSwim;
}
@@ -285,12 +285,12 @@ BOOL CPhysics::RetSwim() // Indicates whether a collision occurred.
-void CPhysics::SetCollision(BOOL bCollision)
+void CPhysics::SetCollision(bool bCollision)
{
m_bCollision = bCollision;
}
-BOOL CPhysics::RetCollision()
+bool CPhysics::RetCollision()
{
return m_bCollision;
}
@@ -298,12 +298,12 @@ BOOL CPhysics::RetCollision() // Indicates whether the influence of soil is activated or not.
-void CPhysics::SetFreeze(BOOL bFreeze)
+void CPhysics::SetFreeze(bool bFreeze)
{
m_bFreeze = bFreeze;
}
-BOOL CPhysics::RetFreeze()
+bool CPhysics::RetFreeze()
{
return m_bFreeze;
}
@@ -764,11 +764,11 @@ float CPhysics::RetLinLength(float dist) // Management of an event.
-// Returns FALSE if the object is destroyed.
+// Returns false if the object is destroyed.
-BOOL CPhysics::EventProcess(const Event &event)
+bool CPhysics::EventProcess(const Event &event)
{
- if ( !m_object->RetEnable() ) return TRUE;
+ if ( !m_object->RetEnable() ) return true;
if ( m_brain != 0 )
{
@@ -779,7 +779,7 @@ BOOL CPhysics::EventProcess(const Event &event) {
return EventFrame(event);
}
- return TRUE;
+ return true;
}
@@ -855,7 +855,7 @@ void CPhysics::MotorUpdate(float aTime, float rTime) {
motorSpeed.y = -1.0f; // grave
}
- SetMotor(FALSE);
+ SetMotor(false);
}
}
@@ -871,7 +871,7 @@ void CPhysics::MotorUpdate(float aTime, float rTime) {
motorSpeed.y = -1.0f; // grave
}
- SetMotor(FALSE);
+ SetMotor(false);
}
if ( m_type == TYPE_FLYING && !m_bLand && motorSpeed.y > 0.0f )
@@ -903,16 +903,16 @@ void CPhysics::MotorUpdate(float aTime, float rTime) if ( m_bLowLevel && m_object->RetSelect() ) // beep cool?
{
m_sound->Play(SOUND_INFO, m_object->RetPosition(0), 1.0f, 2.0f);
- m_bLowLevel = FALSE;
+ m_bLowLevel = false;
}
}
- m_bObstacle = FALSE;
+ m_bObstacle = false;
}
else // in flight?
{
m_reactorRange -= rTime*(1.0f/m_object->RetRange());
if ( m_reactorRange < 0.0f ) m_reactorRange = 0.0f;
- if ( m_reactorRange < 0.5f ) m_bLowLevel = TRUE;
+ if ( m_reactorRange < 0.5f ) m_bLowLevel = true;
}
if ( m_reactorRange == 0.0f ) // reactor tilt?
@@ -996,8 +996,8 @@ void CPhysics::MotorUpdate(float aTime, float rTime) h += m_object->RetCharacter()->height;
if ( motorSpeed.y > 0.0f && m_reactorRange > 0.1f && pos.y < h )
{
- m_bLand = FALSE; // take off
- SetMotor(TRUE);
+ m_bLand = false; // take off
+ SetMotor(true);
pos.y += 0.05f; // small initial height (startup)
m_object->SetPosition(0, pos);
}
@@ -1008,11 +1008,11 @@ void CPhysics::MotorUpdate(float aTime, float rTime) if ( motorSpeed.x == 0.0f &&
motorSpeed.z == 0.0f )
{
- SetMotor(FALSE);
+ SetMotor(false);
}
else
{
- SetMotor(TRUE);
+ SetMotor(true);
}
}
@@ -1048,18 +1048,18 @@ void CPhysics::EffectUpdate(float aTime, float rTime) D3DVECTOR vibLin, vibCir, incl;
float speedLin, speedCir, accel;
ObjectType type;
- BOOL bOnBoard;
+ bool bOnBoard;
if ( !m_engine->IsVisiblePoint(m_object->RetPosition(0)) ) return;
type = m_object->RetType();
character = m_object->RetCharacter();
- bOnBoard = FALSE;
+ bOnBoard = false;
if ( m_object->RetSelect() &&
m_camera->RetType() == CAMERA_ONBOARD )
{
- bOnBoard = TRUE;
+ bOnBoard = true;
}
vibLin = m_motion->RetLinVibration();
@@ -1456,7 +1456,7 @@ void CPhysics::UpdateMotionStruct(float rTime, Motion &motion) // Makes physics evolve as time elapsed.
-// Returns FALSE if the object is destroyed.
+// Returns false if the object is destroyed.
//
// a: acceleration
// v1: velocity at time t1
@@ -1467,7 +1467,7 @@ void CPhysics::UpdateMotionStruct(float rTime, Motion &motion) // v2 = v1 + a*dt
// dd = v2*dt
-BOOL CPhysics::EventFrame(const Event &event)
+bool CPhysics::EventFrame(const Event &event)
{
ObjectType type;
D3DMATRIX objRotate, matRotate;
@@ -1475,7 +1475,7 @@ BOOL CPhysics::EventFrame(const Event &event) float h, w;
int i;
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
m_time += event.rTime;
m_timeUnderWater += event.rTime;
@@ -1582,7 +1582,7 @@ BOOL CPhysics::EventFrame(const Event &event) i = ObjectAdapt(newpos, newangle);
if ( i == 2 ) // object destroyed?
{
- return FALSE;
+ return false;
}
if ( i == 1 ) // immobile object?
{
@@ -1607,9 +1607,9 @@ BOOL CPhysics::EventFrame(const Event &event) MotorParticule(m_time, event.rTime);
SoundMotor(event.rTime);
- m_bForceUpdate = FALSE;
+ m_bForceUpdate = false;
- return TRUE;
+ return true;
}
// Starts or stops the engine sounds.
@@ -1861,7 +1861,7 @@ void CPhysics::SoundMotorFull(float rTime, ObjectType type) {
if ( m_soundChannel == -1 )
{
- m_soundChannel = m_sound->Play(SOUND_MOTORi, m_object->RetPosition(0), 0.0f, 1.0f, TRUE);
+ m_soundChannel = m_sound->Play(SOUND_MOTORi, m_object->RetPosition(0), 0.0f, 1.0f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 0.2f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 1.0f, SOPER_LOOP);
}
@@ -1934,7 +1934,7 @@ void CPhysics::SoundMotorFull(float rTime, ObjectType type) if ( m_soundChannel == -1 )
{
- m_soundChannel = m_sound->Play(sound, m_object->RetPosition(0), 0.0f, 0.5f, TRUE);
+ m_soundChannel = m_sound->Play(sound, m_object->RetPosition(0), 0.0f, 0.5f, true);
m_sound->AddEnvelope(m_soundChannel, amplitude, freq, time, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, amplitude, freq, 1.0f, SOPER_LOOP);
}
@@ -1947,7 +1947,7 @@ void CPhysics::SoundMotorFull(float rTime, ObjectType type) m_sound->FlushEnvelope(m_soundChannel);
m_sound->AddEnvelope(m_soundChannel, amplitude, freq, time, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, amplitude, freq, 1.0f, SOPER_LOOP);
- m_bSoundSlow = FALSE;
+ m_bSoundSlow = false;
}
}
@@ -2028,7 +2028,7 @@ void CPhysics::SoundMotorSlow(float rTime, ObjectType type) if ( m_soundChannel == -1 )
{
- m_soundChannel = m_sound->Play(sound, m_object->RetPosition(0), 0.0f, 0.25f, TRUE);
+ m_soundChannel = m_sound->Play(sound, m_object->RetPosition(0), 0.0f, 0.25f, true);
m_sound->AddEnvelope(m_soundChannel, amplitude, 0.5f, 0.2f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, amplitude, 0.5f, 1.0f, SOPER_LOOP);
}
@@ -2041,7 +2041,7 @@ void CPhysics::SoundMotorSlow(float rTime, ObjectType type) m_sound->FlushEnvelope(m_soundChannel);
m_sound->AddEnvelope(m_soundChannel, amplitude, 0.5f, 0.3f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, amplitude, 0.5f, 1.0f, SOPER_LOOP);
- m_bSoundSlow = TRUE;
+ m_bSoundSlow = true;
}
}
@@ -2146,7 +2146,7 @@ void CPhysics::SoundReactorFull(float rTime, ObjectType type) sound = SOUND_FLY;
}
- m_soundChannel = m_sound->Play(sound, m_object->RetPosition(0), 0.0f, 1.0f, TRUE);
+ m_soundChannel = m_sound->Play(sound, m_object->RetPosition(0), 0.0f, 1.0f, true);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 0.6f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannel, 1.0f, 1.0f, 1.0f, SOPER_LOOP);
}
@@ -2264,7 +2264,7 @@ void CPhysics::SoundReactorStop(float rTime, ObjectType type) {
if ( m_soundChannelSlide == -1 )
{
- m_soundChannelSlide = m_sound->Play(SOUND_SLIDE, m_object->RetPosition(0), 0.0f, 1.0f, TRUE);
+ m_soundChannelSlide = m_sound->Play(SOUND_SLIDE, m_object->RetPosition(0), 0.0f, 1.0f, true);
m_sound->AddEnvelope(m_soundChannelSlide, 0.5f, 1.0f, 0.3f, SOPER_CONTINUE);
m_sound->AddEnvelope(m_soundChannelSlide, 0.5f, 1.0f, 1.0f, SOPER_LOOP);
}
@@ -2293,7 +2293,7 @@ void CPhysics::FloorAdapt(float aTime, float rTime, D3DVECTOR norm;
D3DMATRIX matRotate;
float level, h, f, a1, volume, freq, force;
- BOOL bOldSwim, bSlopingTerrain;
+ bool bOldSwim, bSlopingTerrain;
type = m_object->RetType();
character = m_object->RetCharacter();
@@ -2320,7 +2320,7 @@ void CPhysics::FloorAdapt(float aTime, float rTime, if ( m_type == TYPE_FLYING )
{
- bSlopingTerrain = FALSE; // ground as possible to land
+ bSlopingTerrain = false; // ground as possible to land
if ( !m_bLand ) // in flight?
{
@@ -2328,7 +2328,7 @@ void CPhysics::FloorAdapt(float aTime, float rTime, a1 = Abs(RotateAngle(Length(norm.x, norm.z), norm.y));
if ( a1 < (90.0f-55.0f)*PI/180.0f ) // slope exceeds 55 degrees?
{
- bSlopingTerrain = TRUE; // very sloped ground
+ bSlopingTerrain = true; // very sloped ground
if ( h < 4.0f ) // collision with the ground?
{
@@ -2362,8 +2362,8 @@ void CPhysics::FloorAdapt(float aTime, float rTime, m_sound->Play(SOUND_BOUM, pos, volume, freq);
}
- m_bLand = TRUE; // on the ground?
- SetMotor(FALSE);
+ m_bLand = true; // on the ground?
+ SetMotor(false);
pos.y -= h; // plate to the ground immediately
m_floorHeight = 0.0f;
@@ -2617,8 +2617,8 @@ int CPhysics::ObjectAdapt(const D3DVECTOR &pos, const D3DVECTOR &angle) distance = Length(oPos, iiPos);
if ( distance >= iRad+oRad ) // view (*)
{
- m_bCollision = TRUE;
- m_bObstacle = TRUE;
+ m_bCollision = true;
+ m_bObstacle = true;
sound = pObj->RetCrashSphereSound(j-1);
if ( sound != SOUND_CLICK )
@@ -2696,14 +2696,14 @@ int CPhysics::ObjectAdapt(const D3DVECTOR &pos, const D3DVECTOR &angle) // Shakes an object.
-BOOL CPhysics::JostleObject(CObject* pObj, D3DVECTOR iPos, float iRad,
+bool CPhysics::JostleObject(CObject* pObj, D3DVECTOR iPos, float iRad,
D3DVECTOR oPos, float oRad)
{
D3DVECTOR speed;
float distance, force, d, f;
distance = Length(oPos, iPos);
- if ( distance >= iRad+oRad ) return FALSE;
+ if ( distance >= iRad+oRad ) return false;
d = (iRad+oRad)/2.0f;
f = (distance-d)/d; // 0 = off, 1 = near
@@ -2726,13 +2726,13 @@ BOOL CPhysics::JostleObject(CObject* pObj, D3DVECTOR iPos, float iRad, // Shakes forcing an object.
-BOOL CPhysics::JostleObject(CObject* pObj, float force)
+bool CPhysics::JostleObject(CObject* pObj, float force)
{
D3DVECTOR oPos;
float oRad;
pObj->GetJotlerSphere(oPos, oRad);
- if ( oRad <= 0.0f ) return FALSE;
+ if ( oRad <= 0.0f ) return false;
if ( m_soundTimeJostle >= 0.20f )
{
@@ -2744,14 +2744,14 @@ BOOL CPhysics::JostleObject(CObject* pObj, float force) }
// Effects of the explosion on the object buffers.
-// Returns TRUE if we ignore this obstacle.
+// Returns true if we ignore this obstacle.
-BOOL CPhysics::ExploOther(ObjectType iType,
+bool CPhysics::ExploOther(ObjectType iType,
CObject *pObj, ObjectType oType, float force)
{
CPyro* pyro;
- if ( !pObj->RetEnable() ) return TRUE;
+ if ( !pObj->RetEnable() ) return true;
JostleObject(pObj, 1.0f); // shakes the object
@@ -2847,7 +2847,7 @@ BOOL CPhysics::ExploOther(ObjectType iType, pyro->Create(PT_FRAGT, pObj); // total destruction
}
- return FALSE;
+ return false;
}
// Effects of the explosion on the object itself.
@@ -2986,13 +2986,13 @@ void CPhysics::FrameParticule(float aTime, float rTime) CObject* power;
float energy, intensity;
int effectLight;
- BOOL bFlash;
+ bool bFlash;
m_restBreakParticule -= rTime;
if ( aTime-m_lastPowerParticule < m_engine->ParticuleAdapt(0.05f) ) return;
m_lastPowerParticule = aTime;
- bFlash = FALSE;
+ bFlash = false;
energy = 0.0f;
power = m_object->RetPower();
@@ -3005,8 +3005,8 @@ void CPhysics::FrameParticule(float aTime, float rTime) {
if ( energy > m_lastEnergy ) // recharge?
{
- PowerParticule(1.0f, FALSE);
- bFlash = TRUE;
+ PowerParticule(1.0f, false);
+ bFlash = true;
}
if ( energy == 0.0f || m_lastEnergy == 0.0f )
@@ -3020,7 +3020,7 @@ void CPhysics::FrameParticule(float aTime, float rTime) if ( m_restBreakParticule > 0.0f )
{
PowerParticule(m_restBreakParticule/2.5f, (energy == 0));
- bFlash = TRUE;
+ bFlash = true;
}
effectLight = m_object->RetEffectLight();
@@ -3042,21 +3042,21 @@ void CPhysics::FrameParticule(float aTime, float rTime) // Generates some particles after a recharge.
-void CPhysics::PowerParticule(float factor, BOOL bBreak)
+void CPhysics::PowerParticule(float factor, bool bBreak)
{
Character* character;
CObject* fret;
D3DMATRIX* mat;
D3DVECTOR pos, ppos, eye, speed;
FPOINT dim;
- BOOL bCarryPower;
+ bool bCarryPower;
- bCarryPower = FALSE;
+ bCarryPower = false;
fret = m_object->RetFret();
if ( fret != 0 && fret->RetType() == OBJECT_POWER &&
m_object->RetAngleZ(1) == ARM_STOCK_ANGLE1 )
{
- bCarryPower = TRUE; // carries a battery
+ bCarryPower = true; // carries a battery
}
mat = m_object->RetWorldMatrix(0);
@@ -3808,7 +3808,7 @@ void CPhysics::WheelParticule(int color, float width) m_wheelParticulePos[1] = goal2;
}
- while ( TRUE )
+ while ( true )
{
dist1 = Length(m_wheelParticulePos[0], goal1);
if ( dist1 < step ) break;
@@ -3827,18 +3827,18 @@ void CPhysics::WheelParticule(int color, float width) m_wheelParticulePos[1] = wheel2;
}
- m_bWheelParticuleBrake = TRUE;
+ m_bWheelParticuleBrake = true;
}
else
{
- m_bWheelParticuleBrake = FALSE;
+ m_bWheelParticuleBrake = false;
}
}
// Creates the interface.
-void CPhysics::CreateInterface(BOOL bSelect)
+void CPhysics::CreateInterface(bool bSelect)
{
if ( m_brain != 0 )
{
diff --git a/src/physics/physics.h b/src/physics/physics.h index aa14a71..bc1c8b6 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -90,9 +90,9 @@ public: CPhysics(CInstanceManager* iMan, CObject* object);
~CPhysics();
- void DeleteObject(BOOL bAll=FALSE);
+ void DeleteObject(bool bAll=false);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void SetBrain(CBrain* brain);
void SetMotion(CMotion* motion);
@@ -100,8 +100,8 @@ public: void SetType(PhysicsType type);
PhysicsType RetType();
- BOOL Write(char *line);
- BOOL Read(char *line);
+ bool Write(char *line);
+ bool Read(char *line);
void SetGravity(float value);
float RetGravity();
@@ -132,16 +132,16 @@ public: float RetLinTimeLength(float dist, float dir=1.0f);
float RetLinLength(float dist);
- void SetMotor(BOOL bState);
- BOOL RetMotor();
- void SetLand(BOOL bState);
- BOOL RetLand();
- void SetSwim(BOOL bState);
- BOOL RetSwim();
- void SetCollision(BOOL bCollision);
- BOOL RetCollision();
- void SetFreeze(BOOL bFreeze);
- BOOL RetFreeze();
+ void SetMotor(bool bState);
+ bool RetMotor();
+ void SetLand(bool bState);
+ bool RetLand();
+ void SetSwim(bool bState);
+ bool RetSwim();
+ void SetCollision(bool bCollision);
+ bool RetCollision();
+ void SetFreeze(bool bFreeze);
+ bool RetFreeze();
void SetReactorRange(float range);
float RetReactorRange();
@@ -154,11 +154,11 @@ public: float RetMotorSpeedY();
float RetMotorSpeedZ();
- void CreateInterface(BOOL bSelect);
+ void CreateInterface(bool bSelect);
Error RetError();
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
void WaterFrame(float aTime, float rTime);
void SoundMotor(float rTime);
void SoundMotorFull(float rTime, ObjectType type);
@@ -173,12 +173,12 @@ protected: void FloorAdapt(float aTime, float rTime, D3DVECTOR &pos, D3DVECTOR &angle);
void FloorAngle(const D3DVECTOR &pos, D3DVECTOR &angle);
int ObjectAdapt(const D3DVECTOR &pos, const D3DVECTOR &angle);
- BOOL JostleObject(CObject* pObj, D3DVECTOR iPos, float iRad, D3DVECTOR oPos, float oRad);
- BOOL JostleObject(CObject* pObj, float force);
- BOOL ExploOther(ObjectType iType, CObject *pObj, ObjectType oType, float force);
+ bool JostleObject(CObject* pObj, D3DVECTOR iPos, float iRad, D3DVECTOR oPos, float oRad);
+ bool JostleObject(CObject* pObj, float force);
+ bool ExploOther(ObjectType iType, CObject *pObj, ObjectType oType, float force);
int ExploHimself(ObjectType iType, ObjectType oType, float force);
- void PowerParticule(float factor, BOOL bBreak);
+ void PowerParticule(float factor, bool bBreak);
void CrashParticule(float crash);
void MotorParticule(float aTime, float rTime);
void WaterParticule(float aTime, D3DVECTOR pos, ObjectType type, float floor, float advance, float turn);
@@ -203,12 +203,12 @@ protected: D3DVECTOR m_motorSpeed; // motor speed (-1..1)
Motion m_linMotion; // linear motion
Motion m_cirMotion; // circular motion
- BOOL m_bMotor;
- BOOL m_bLand;
- BOOL m_bSwim;
- BOOL m_bCollision;
- BOOL m_bObstacle;
- BOOL m_bFreeze;
+ bool m_bMotor;
+ bool m_bLand;
+ bool m_bSwim;
+ bool m_bCollision;
+ bool m_bObstacle;
+ bool m_bFreeze;
int m_repeatCollision;
float m_linVibrationFactor;
float m_cirVibrationFactor;
@@ -220,7 +220,7 @@ protected: float m_lastUnderParticule;
float m_lastPloufParticule;
float m_lastFlameParticule;
- BOOL m_bWheelParticuleBrake;
+ bool m_bWheelParticuleBrake;
D3DVECTOR m_wheelParticulePos[2];
float m_absorbWater;
float m_reactorTemperature;
@@ -238,9 +238,9 @@ protected: float m_soundTimePshhh;
float m_soundTimeJostle;
float m_soundTimeBoum;
- BOOL m_bSoundSlow;
- BOOL m_bForceUpdate;
- BOOL m_bLowLevel;
+ bool m_bSoundSlow;
+ bool m_bForceUpdate;
+ bool m_bLowLevel;
};
diff --git a/src/script/ClassFILE.cpp b/src/script/ClassFILE.cpp index ef98e14..2c97fab 100644 --- a/src/script/ClassFILE.cpp +++ b/src/script/ClassFILE.cpp @@ -57,15 +57,15 @@ void PrepareFilename(CBotString &filename) // get the filename as a parameter
// execution
-BOOL rfconstruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
+bool rfconstruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
{
CBotString mode;
// accepts no parameters
- if ( pVar == NULL ) return TRUE;
+ if ( pVar == NULL ) return true;
// must be a character string
- if ( pVar->GivType() != CBotTypString ) { Exception = CBotErrBadString; return FALSE; }
+ if ( pVar->GivType() != CBotTypString ) { Exception = CBotErrBadString; return false; }
CBotString filename = pVar->GivValString();
PrepareFilename(filename);
@@ -76,10 +76,10 @@ BOOL rfconstruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exceptio {
// recover mode
mode = pVar->GivValString();
- if ( mode != "r" && mode != "w" ) { Exception = CBotErrBadParam; return FALSE; }
+ if ( mode != "r" && mode != "w" ) { Exception = CBotErrBadParam; return false; }
// no third parameter
- if ( pVar->GivNext() != NULL ) { Exception = CBotErrOverParam; return FALSE; }
+ if ( pVar->GivNext() != NULL ) { Exception = CBotErrOverParam; return false; }
}
// saves the file name
@@ -90,7 +90,7 @@ BOOL rfconstruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exceptio {
// opens the requested file
FILE* pFile = fopen( filename, mode );
- if ( pFile == NULL ) { Exception = CBotErrFileOpen; return FALSE; }
+ if ( pFile == NULL ) { Exception = CBotErrFileOpen; return false; }
m_CompteurFileOpen ++;
@@ -99,7 +99,7 @@ BOOL rfconstruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exceptio pVar->SetValInt((long)pFile);
}
- return TRUE;
+ return true;
}
// compilation
@@ -131,13 +131,13 @@ CBotTypResult cfconstruct (CBotVar* pThis, CBotVar* &pVar) // destructor of the class
// execution
-BOOL rfdestruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
+bool rfdestruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
{
// retrieve the item "handle"
pVar = pThis->GivItem("handle");
// don't open? no problem :)
- if ( pVar->GivInit() != IS_DEF) return TRUE;
+ if ( pVar->GivInit() != IS_DEF) return true;
FILE* pFile= (FILE*)pVar->GivValInt();
fclose(pFile);
@@ -145,7 +145,7 @@ BOOL rfdestruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception pVar->SetInit(IS_NAN);
- return TRUE;
+ return true;
}
@@ -153,13 +153,13 @@ BOOL rfdestruct (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception // get the r/w mode as a parameter
// execution
-BOOL rfopen (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
+bool rfopen (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
{
// there must be a parameter
- if ( pVar == NULL ) { Exception = CBotErrLowParam; return FALSE; }
+ if ( pVar == NULL ) { Exception = CBotErrLowParam; return false; }
// which must be a character string
- if ( pVar->GivType() != CBotTypString ) { Exception = CBotErrBadString; return FALSE; }
+ if ( pVar->GivType() != CBotTypString ) { Exception = CBotErrBadString; return false; }
// There may be a second parameter
if ( pVar->GivNext() != NULL )
@@ -177,16 +177,16 @@ BOOL rfopen (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception) }
CBotString mode = pVar->GivValString();
- if ( mode != "r" && mode != "w" ) { Exception = CBotErrBadParam; return FALSE; }
+ if ( mode != "r" && mode != "w" ) { Exception = CBotErrBadParam; return false; }
// no third parameter
- if ( pVar->GivNext() != NULL ) { Exception = CBotErrOverParam; return FALSE; }
+ if ( pVar->GivNext() != NULL ) { Exception = CBotErrOverParam; return false; }
// retrieve the item "handle"
pVar = pThis->GivItem("handle");
// which must not be initialized
- if ( pVar->GivInit() == IS_DEF) { Exception = CBotErrFileOpen; return FALSE; }
+ if ( pVar->GivInit() == IS_DEF) { Exception = CBotErrFileOpen; return false; }
// file contains the name
pVar = pThis->GivItem("filename");
@@ -198,8 +198,8 @@ BOOL rfopen (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception) FILE* pFile = fopen( filename, mode );
if ( pFile == NULL )
{
- pResult->SetValInt(FALSE);
- return TRUE;
+ pResult->SetValInt(false);
+ return true;
}
m_CompteurFileOpen ++;
@@ -208,8 +208,8 @@ BOOL rfopen (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception) pVar = pThis->GivItem("handle");
pVar->SetValInt((long)pFile);
- pResult->SetValInt(TRUE);
- return TRUE;
+ pResult->SetValInt(true);
+ return true;
}
// compilation
@@ -242,7 +242,7 @@ CBotTypResult cfopen (CBotVar* pThis, CBotVar* &pVar) // process FILE :: close
// execeution
-BOOL rfclose (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
+bool rfclose (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
{
// it shouldn't be any parameters
if ( pVar != NULL ) return CBotErrOverParam;
@@ -250,7 +250,7 @@ BOOL rfclose (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception) // retrieve the item "handle"
pVar = pThis->GivItem("handle");
- if ( pVar->GivInit() != IS_DEF) { Exception = CBotErrNotOpen; return FALSE; }
+ if ( pVar->GivInit() != IS_DEF) { Exception = CBotErrNotOpen; return false; }
FILE* pFile= (FILE*)pVar->GivValInt();
fclose(pFile);
@@ -258,7 +258,7 @@ BOOL rfclose (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception) pVar->SetInit(IS_NAN);
- return TRUE;
+ return true;
}
// compilation
@@ -274,29 +274,29 @@ CBotTypResult cfclose (CBotVar* pThis, CBotVar* &pVar) // process FILE :: writeln
// execution
-BOOL rfwrite (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
+bool rfwrite (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
{
// there must be a parameter
- if ( pVar == NULL ) { Exception = CBotErrLowParam; return FALSE; }
+ if ( pVar == NULL ) { Exception = CBotErrLowParam; return false; }
// which must be a character string
- if ( pVar->GivType() != CBotTypString ) { Exception = CBotErrBadString; return FALSE; }
+ if ( pVar->GivType() != CBotTypString ) { Exception = CBotErrBadString; return false; }
CBotString param = pVar->GivValString();
// retrieve the item "handle"
pVar = pThis->GivItem("handle");
- if ( pVar->GivInit() != IS_DEF) { Exception = CBotErrNotOpen; return FALSE; }
+ if ( pVar->GivInit() != IS_DEF) { Exception = CBotErrNotOpen; return false; }
FILE* pFile= (FILE*)pVar->GivValInt();
int res = fputs(param+CBotString("\n"), pFile);
// if an error occurs generate an exception
- if ( res < 0 ) { Exception = CBotErrWrite; return FALSE; }
+ if ( res < 0 ) { Exception = CBotErrWrite; return false; }
- return TRUE;
+ return true;
}
// compilation
@@ -318,15 +318,15 @@ CBotTypResult cfwrite (CBotVar* pThis, CBotVar* &pVar) // process FILE :: readln
// execution
-BOOL rfread (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
+bool rfread (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
{
// it shouldn't be any parameters
- if ( pVar != NULL ) { Exception = CBotErrOverParam; return FALSE; }
+ if ( pVar != NULL ) { Exception = CBotErrOverParam; return false; }
// retrieve the item "handle"
pVar = pThis->GivItem("handle");
- if ( pVar->GivInit() != IS_DEF) { Exception = CBotErrNotOpen; return FALSE; }
+ if ( pVar->GivInit() != IS_DEF) { Exception = CBotErrNotOpen; return false; }
FILE* pFile= (FILE*)pVar->GivValInt();
@@ -339,11 +339,11 @@ BOOL rfread (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception) for ( i = 0 ; i < 2000 ; i++ ) if (chaine[i] == '\n') chaine[i] = 0;
// if an error occurs generate an exception
- if ( ferror(pFile) ) { Exception = CBotErrRead; return FALSE; }
+ if ( ferror(pFile) ) { Exception = CBotErrRead; return false; }
pResult->SetValString( chaine );
- return TRUE;
+ return true;
}
// compilation
@@ -359,21 +359,21 @@ CBotTypResult cfread (CBotVar* pThis, CBotVar* &pVar) // execution
-BOOL rfeof (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
+bool rfeof (CBotVar* pThis, CBotVar* pVar, CBotVar* pResult, int& Exception)
{
// it should not be any parameter
- if ( pVar != NULL ) { Exception = CBotErrOverParam; return FALSE; }
+ if ( pVar != NULL ) { Exception = CBotErrOverParam; return false; }
// retrieve the item "handle"
pVar = pThis->GivItem("handle");
- if ( pVar->GivInit() != IS_DEF) { Exception = CBotErrNotOpen; return FALSE; }
+ if ( pVar->GivInit() != IS_DEF) { Exception = CBotErrNotOpen; return false; }
FILE* pFile= (FILE*)pVar->GivValInt();
pResult->SetValInt( feof( pFile ) );
- return TRUE;
+ return true;
}
// compilation
diff --git a/src/script/cbottoken.cpp b/src/script/cbottoken.cpp index ce1a161..7387771 100644 --- a/src/script/cbottoken.cpp +++ b/src/script/cbottoken.cpp @@ -349,90 +349,90 @@ char* RetHelpFilename(const char *token) // Test if a keyword is a type of variable.
-BOOL IsType(const char *token)
+bool IsType(const char *token)
{
- if ( strcmp(token, "void" ) == 0 ) return TRUE;
- if ( strcmp(token, "int" ) == 0 ) return TRUE;
- if ( strcmp(token, "float" ) == 0 ) return TRUE;
- if ( strcmp(token, "bool" ) == 0 ) return TRUE;
- if ( strcmp(token, "string" ) == 0 ) return TRUE;
- if ( strcmp(token, "point" ) == 0 ) return TRUE;
- if ( strcmp(token, "object" ) == 0 ) return TRUE;
- if ( strcmp(token, "file" ) == 0 ) return TRUE;
- if ( strcmp(token, "this" ) == 0 ) return TRUE;
- return FALSE;
+ if ( strcmp(token, "void" ) == 0 ) return true;
+ if ( strcmp(token, "int" ) == 0 ) return true;
+ if ( strcmp(token, "float" ) == 0 ) return true;
+ if ( strcmp(token, "bool" ) == 0 ) return true;
+ if ( strcmp(token, "string" ) == 0 ) return true;
+ if ( strcmp(token, "point" ) == 0 ) return true;
+ if ( strcmp(token, "object" ) == 0 ) return true;
+ if ( strcmp(token, "file" ) == 0 ) return true;
+ if ( strcmp(token, "this" ) == 0 ) return true;
+ return false;
}
// Test if a keyword is a function.
-BOOL IsFunction(const char *token)
+bool IsFunction(const char *token)
{
- if ( strcmp(token, "sin" ) == 0 ) return TRUE;
- if ( strcmp(token, "cos" ) == 0 ) return TRUE;
- if ( strcmp(token, "tan" ) == 0 ) return TRUE;
- if ( strcmp(token, "asin" ) == 0 ) return TRUE;
- if ( strcmp(token, "acos" ) == 0 ) return TRUE;
- if ( strcmp(token, "atan" ) == 0 ) return TRUE;
- if ( strcmp(token, "sqrt" ) == 0 ) return TRUE;
- if ( strcmp(token, "pow" ) == 0 ) return TRUE;
- if ( strcmp(token, "rand" ) == 0 ) return TRUE;
- if ( strcmp(token, "abs" ) == 0 ) return TRUE;
- if ( strcmp(token, "retobject" ) == 0 ) return TRUE;
- if ( strcmp(token, "search" ) == 0 ) return TRUE;
- if ( strcmp(token, "radar" ) == 0 ) return TRUE;
- if ( strcmp(token, "detect" ) == 0 ) return TRUE;
- if ( strcmp(token, "direction" ) == 0 ) return TRUE;
- if ( strcmp(token, "distance" ) == 0 ) return TRUE;
- if ( strcmp(token, "distance2d" ) == 0 ) return TRUE;
- if ( strcmp(token, "space" ) == 0 ) return TRUE;
- if ( strcmp(token, "flatground" ) == 0 ) return TRUE;
- if ( strcmp(token, "wait" ) == 0 ) return TRUE;
- if ( strcmp(token, "move" ) == 0 ) return TRUE;
- if ( strcmp(token, "turn" ) == 0 ) return TRUE;
- if ( strcmp(token, "goto" ) == 0 ) return TRUE;
- if ( strcmp(token, "find" ) == 0 ) return TRUE;
- if ( strcmp(token, "grab" ) == 0 ) return TRUE;
- if ( strcmp(token, "drop" ) == 0 ) return TRUE;
- if ( strcmp(token, "sniff" ) == 0 ) return TRUE;
- if ( strcmp(token, "receive" ) == 0 ) return TRUE;
- if ( strcmp(token, "send" ) == 0 ) return TRUE;
- if ( strcmp(token, "deleteinfo" ) == 0 ) return TRUE;
- if ( strcmp(token, "testinfo" ) == 0 ) return TRUE;
- if ( strcmp(token, "thump" ) == 0 ) return TRUE;
- if ( strcmp(token, "recycle" ) == 0 ) return TRUE;
- if ( strcmp(token, "shield" ) == 0 ) return TRUE;
- if ( strcmp(token, "fire" ) == 0 ) return TRUE;
- if ( strcmp(token, "antfire" ) == 0 ) return TRUE;
- if ( strcmp(token, "aim" ) == 0 ) return TRUE;
- if ( strcmp(token, "motor" ) == 0 ) return TRUE;
- if ( strcmp(token, "jet" ) == 0 ) return TRUE;
- if ( strcmp(token, "topo" ) == 0 ) return TRUE;
- if ( strcmp(token, "message" ) == 0 ) return TRUE;
- if ( strcmp(token, "abstime" ) == 0 ) return TRUE;
- if ( strcmp(token, "ismovie" ) == 0 ) return TRUE;
- if ( strcmp(token, "errmode" ) == 0 ) return TRUE;
- if ( strcmp(token, "ipf" ) == 0 ) return TRUE;
- if ( strcmp(token, "strlen" ) == 0 ) return TRUE;
- if ( strcmp(token, "strleft" ) == 0 ) return TRUE;
- if ( strcmp(token, "strright" ) == 0 ) return TRUE;
- if ( strcmp(token, "strmid" ) == 0 ) return TRUE;
- if ( strcmp(token, "strval" ) == 0 ) return TRUE;
- if ( strcmp(token, "strfind" ) == 0 ) return TRUE;
- if ( strcmp(token, "strlower" ) == 0 ) return TRUE;
- if ( strcmp(token, "strupper" ) == 0 ) return TRUE;
- if ( strcmp(token, "open" ) == 0 ) return TRUE;
- if ( strcmp(token, "close" ) == 0 ) return TRUE;
- if ( strcmp(token, "writeln" ) == 0 ) return TRUE;
- if ( strcmp(token, "readln" ) == 0 ) return TRUE;
- if ( strcmp(token, "eof" ) == 0 ) return TRUE;
- if ( strcmp(token, "deletefile" ) == 0 ) return TRUE;
- if ( strcmp(token, "openfile" ) == 0 ) return TRUE;
- if ( strcmp(token, "pendown" ) == 0 ) return TRUE;
- if ( strcmp(token, "penup" ) == 0 ) return TRUE;
- if ( strcmp(token, "pencolor" ) == 0 ) return TRUE;
- if ( strcmp(token, "penwidth" ) == 0 ) return TRUE;
- if ( strcmp(token, "sizeof" ) == 0 ) return TRUE;
- return FALSE;
+ if ( strcmp(token, "sin" ) == 0 ) return true;
+ if ( strcmp(token, "cos" ) == 0 ) return true;
+ if ( strcmp(token, "tan" ) == 0 ) return true;
+ if ( strcmp(token, "asin" ) == 0 ) return true;
+ if ( strcmp(token, "acos" ) == 0 ) return true;
+ if ( strcmp(token, "atan" ) == 0 ) return true;
+ if ( strcmp(token, "sqrt" ) == 0 ) return true;
+ if ( strcmp(token, "pow" ) == 0 ) return true;
+ if ( strcmp(token, "rand" ) == 0 ) return true;
+ if ( strcmp(token, "abs" ) == 0 ) return true;
+ if ( strcmp(token, "retobject" ) == 0 ) return true;
+ if ( strcmp(token, "search" ) == 0 ) return true;
+ if ( strcmp(token, "radar" ) == 0 ) return true;
+ if ( strcmp(token, "detect" ) == 0 ) return true;
+ if ( strcmp(token, "direction" ) == 0 ) return true;
+ if ( strcmp(token, "distance" ) == 0 ) return true;
+ if ( strcmp(token, "distance2d" ) == 0 ) return true;
+ if ( strcmp(token, "space" ) == 0 ) return true;
+ if ( strcmp(token, "flatground" ) == 0 ) return true;
+ if ( strcmp(token, "wait" ) == 0 ) return true;
+ if ( strcmp(token, "move" ) == 0 ) return true;
+ if ( strcmp(token, "turn" ) == 0 ) return true;
+ if ( strcmp(token, "goto" ) == 0 ) return true;
+ if ( strcmp(token, "find" ) == 0 ) return true;
+ if ( strcmp(token, "grab" ) == 0 ) return true;
+ if ( strcmp(token, "drop" ) == 0 ) return true;
+ if ( strcmp(token, "sniff" ) == 0 ) return true;
+ if ( strcmp(token, "receive" ) == 0 ) return true;
+ if ( strcmp(token, "send" ) == 0 ) return true;
+ if ( strcmp(token, "deleteinfo" ) == 0 ) return true;
+ if ( strcmp(token, "testinfo" ) == 0 ) return true;
+ if ( strcmp(token, "thump" ) == 0 ) return true;
+ if ( strcmp(token, "recycle" ) == 0 ) return true;
+ if ( strcmp(token, "shield" ) == 0 ) return true;
+ if ( strcmp(token, "fire" ) == 0 ) return true;
+ if ( strcmp(token, "antfire" ) == 0 ) return true;
+ if ( strcmp(token, "aim" ) == 0 ) return true;
+ if ( strcmp(token, "motor" ) == 0 ) return true;
+ if ( strcmp(token, "jet" ) == 0 ) return true;
+ if ( strcmp(token, "topo" ) == 0 ) return true;
+ if ( strcmp(token, "message" ) == 0 ) return true;
+ if ( strcmp(token, "abstime" ) == 0 ) return true;
+ if ( strcmp(token, "ismovie" ) == 0 ) return true;
+ if ( strcmp(token, "errmode" ) == 0 ) return true;
+ if ( strcmp(token, "ipf" ) == 0 ) return true;
+ if ( strcmp(token, "strlen" ) == 0 ) return true;
+ if ( strcmp(token, "strleft" ) == 0 ) return true;
+ if ( strcmp(token, "strright" ) == 0 ) return true;
+ if ( strcmp(token, "strmid" ) == 0 ) return true;
+ if ( strcmp(token, "strval" ) == 0 ) return true;
+ if ( strcmp(token, "strfind" ) == 0 ) return true;
+ if ( strcmp(token, "strlower" ) == 0 ) return true;
+ if ( strcmp(token, "strupper" ) == 0 ) return true;
+ if ( strcmp(token, "open" ) == 0 ) return true;
+ if ( strcmp(token, "close" ) == 0 ) return true;
+ if ( strcmp(token, "writeln" ) == 0 ) return true;
+ if ( strcmp(token, "readln" ) == 0 ) return true;
+ if ( strcmp(token, "eof" ) == 0 ) return true;
+ if ( strcmp(token, "deletefile" ) == 0 ) return true;
+ if ( strcmp(token, "openfile" ) == 0 ) return true;
+ if ( strcmp(token, "pendown" ) == 0 ) return true;
+ if ( strcmp(token, "penup" ) == 0 ) return true;
+ if ( strcmp(token, "pencolor" ) == 0 ) return true;
+ if ( strcmp(token, "penwidth" ) == 0 ) return true;
+ if ( strcmp(token, "sizeof" ) == 0 ) return true;
+ return false;
}
diff --git a/src/script/cbottoken.h b/src/script/cbottoken.h index 2093d39..ff06fa7 100644 --- a/src/script/cbottoken.h +++ b/src/script/cbottoken.h @@ -29,8 +29,8 @@ extern char* RetObjectName(ObjectType type); extern char* RetObjectAlias(ObjectType type);
extern char* RetHelpFilename(ObjectType type);
extern char* RetHelpFilename(const char *token);
-extern BOOL IsType(const char *token);
-extern BOOL IsFunction(const char *token);
+extern bool IsType(const char *token);
+extern bool IsFunction(const char *token);
extern char* RetHelpText(const char *token);
diff --git a/src/script/cmdtoken.cpp b/src/script/cmdtoken.cpp index 5eac291..e8785ca 100644 --- a/src/script/cmdtoken.cpp +++ b/src/script/cmdtoken.cpp @@ -50,7 +50,7 @@ char* SkipSpace(char *line) // Checks if a line contains a command.
-BOOL Cmd(char *line, char *token)
+bool Cmd(char *line, char *token)
{
char* p;
@@ -87,7 +87,7 @@ char* SearchArg(char *line, int rank) for ( i=0 ; i<rank ; i++ )
{
- while ( TRUE )
+ while ( true )
{
c = *line++;
if ( c == ';' ) break;
@@ -114,7 +114,7 @@ int GetInt(char *line, int rank, int def) p[1] == 'x' ) // begins with "0x" (hexadecimal)?
{
p += 2;
- while ( TRUE )
+ while ( true )
{
if ( *p >= '0' && *p <= '9' )
{
diff --git a/src/script/cmdtoken.h b/src/script/cmdtoken.h index 5b228f8..70e1441 100644 --- a/src/script/cmdtoken.h +++ b/src/script/cmdtoken.h @@ -30,7 +30,7 @@ // Procedures.
-extern BOOL Cmd(char *line, char *token);
+extern bool Cmd(char *line, char *token);
extern char* SearchOp(char *line, char *op);
extern int GetInt(char *line, int rank, int def);
diff --git a/src/script/dd.cpp b/src/script/dd.cpp index 75e332a..b9d5f2f 100644 --- a/src/script/dd.cpp +++ b/src/script/dd.cpp @@ -44,7 +44,7 @@ int cPoint(CBotVar* &var, CBotString& retClass, void* user) // Gives a parameter of type "point".
-BOOL GetPoint(CBotVar* &var, int& exception, D3DVECTOR& pos)
+bool GetPoint(CBotVar* &var, int& exception, D3DVECTOR& pos)
{
CBotVar *pX, *pY, *pZ;
@@ -64,27 +64,27 @@ BOOL GetPoint(CBotVar* &var, int& exception, D3DVECTOR& pos) pX = var->GivItem("x");
if ( pX == NULL )
{
- exception = CBotErrUndefItem; return TRUE;
+ exception = CBotErrUndefItem; return true;
}
pos.x = pX->GivValFloat()*UNIT;
pY = var->GivItem("y");
if ( pY == NULL )
{
- exception = CBotErrUndefItem; return TRUE;
+ exception = CBotErrUndefItem; return true;
}
pos.z = pY->GivValFloat()*UNIT; // attention y -> z !
pZ = var->GivItem("z");
if ( pZ == NULL )
{
- exception = CBotErrUndefItem; return TRUE;
+ exception = CBotErrUndefItem; return true;
}
pos.y = pZ->GivValFloat()*UNIT; // attention z -> y !
var = var->GivNext();
}
- return TRUE;
+ return true;
}
@@ -119,7 +119,7 @@ int cSpace(CBotVar* &var, CBotString& retClass, void* user) // Instruction "space(center, rMin, rMax, dist)".
-BOOL rSpace(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rSpace(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -137,7 +137,7 @@ BOOL rSpace(CBotVar* var, CBotVar* result, int& exception, void* user) }
else
{
- if ( !GetPoint(var, exception, center) ) return TRUE;
+ if ( !GetPoint(var, exception, center) ) return true;
if ( var != 0 )
{
@@ -171,5 +171,5 @@ BOOL rSpace(CBotVar* var, CBotVar* result, int& exception, void* user) pSub->SetValFloat(center.y/UNIT);
}
}
- return TRUE;
+ return true;
}
diff --git a/src/script/script.cpp b/src/script/script.cpp index 1bb4463..8af8acc 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -152,20 +152,20 @@ CBotTypResult cString(CBotVar* &var, void* user) // Seeking value in an array of integers.
-BOOL FindList(CBotVar* array, int type)
+bool FindList(CBotVar* array, int type)
{
while ( array != 0 )
{
- if ( type == array->GivValInt() ) return TRUE;
+ if ( type == array->GivValInt() ) return true;
array = array->GivNext();
}
- return FALSE;
+ return false;
}
// Gives a parameter of type "point".
-BOOL GetPoint(CBotVar* &var, int& exception, D3DVECTOR& pos)
+bool GetPoint(CBotVar* &var, int& exception, D3DVECTOR& pos)
{
CBotVar *pX, *pY, *pZ;
@@ -184,110 +184,110 @@ BOOL GetPoint(CBotVar* &var, int& exception, D3DVECTOR& pos) pX = var->GivItem("x");
if ( pX == NULL )
{
- exception = CBotErrUndefItem; return TRUE;
+ exception = CBotErrUndefItem; return true;
}
pos.x = pX->GivValFloat()*g_unit;
pY = var->GivItem("y");
if ( pY == NULL )
{
- exception = CBotErrUndefItem; return TRUE;
+ exception = CBotErrUndefItem; return true;
}
pos.z = pY->GivValFloat()*g_unit; // attention y -> z !
pZ = var->GivItem("z");
if ( pZ == NULL )
{
- exception = CBotErrUndefItem; return TRUE;
+ exception = CBotErrUndefItem; return true;
}
pos.y = pZ->GivValFloat()*g_unit; // attention z -> y !
var = var->GivNext();
}
- return TRUE;
+ return true;
}
// Instruction "sin(degrees)".
-BOOL rSin(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rSin(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float value;
value = var->GivValFloat();
result->SetValFloat(sinf(value*PI/180.0f));
- return TRUE;
+ return true;
}
// Instruction "cos(degrees)".
-BOOL rCos(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rCos(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float value;
value = var->GivValFloat();
result->SetValFloat(cosf(value*PI/180.0f));
- return TRUE;
+ return true;
}
// Instruction "tan(degrees)".
-BOOL rTan(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rTan(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float value;
value = var->GivValFloat();
result->SetValFloat(tanf(value*PI/180.0f));
- return TRUE;
+ return true;
}
// Instruction "asin(degrees)".
-BOOL raSin(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool raSin(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float value;
value = var->GivValFloat();
result->SetValFloat(asinf(value)*180.0f/PI);
- return TRUE;
+ return true;
}
// Instruction "acos(degrees)".
-BOOL raCos(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool raCos(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float value;
value = var->GivValFloat();
result->SetValFloat(acosf(value)*180.0f/PI);
- return TRUE;
+ return true;
}
// Instruction "atan(degrees)".
-BOOL raTan(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool raTan(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float value;
value = var->GivValFloat();
result->SetValFloat(atanf(value)*180.0f/PI);
- return TRUE;
+ return true;
}
// Instruction "sqrt(value)".
-BOOL rSqrt(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rSqrt(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float value;
value = var->GivValFloat();
result->SetValFloat(sqrtf(value));
- return TRUE;
+ return true;
}
// Instruction "pow(x, y)".
-BOOL rPow(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rPow(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float x, y;
@@ -295,26 +295,26 @@ BOOL rPow(CBotVar* var, CBotVar* result, int& exception, void* user) var = var->GivNext();
y = var->GivValFloat();
result->SetValFloat(powf(x, y));
- return TRUE;
+ return true;
}
// Instruction "rand()".
-BOOL rRand(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rRand(CBotVar* var, CBotVar* result, int& exception, void* user)
{
result->SetValFloat(Rand());
- return TRUE;
+ return true;
}
// Instruction "abs()".
-BOOL rAbs(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rAbs(CBotVar* var, CBotVar* result, int& exception, void* user)
{
float value;
value = var->GivValFloat();
result->SetValFloat(Abs(value));
- return TRUE;
+ return true;
}
@@ -332,7 +332,7 @@ CBotTypResult cRetObject(CBotVar* &var, void* user) // Instruction "retobject(rank)".
-BOOL rRetObject(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rRetObject(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pObj;
@@ -349,7 +349,7 @@ BOOL rRetObject(CBotVar* var, CBotVar* result, int& exception, void* user) {
result->SetPointer(pObj->RetBotVar());
}
- return TRUE;
+ return true;
}
@@ -381,32 +381,32 @@ CBotTypResult cSearch(CBotVar* &var, void* user) // Instruction "search(type, pos)".
-BOOL rSearch(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rSearch(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject *pObj, *pBest;
CBotVar* array;
D3DVECTOR pos, oPos;
- BOOL bNearest = FALSE;
- BOOL bArray;
+ bool bNearest = false;
+ bool bArray;
float min, dist;
int type, oType, i;
if ( var->GivType() == CBotTypArrayPointer )
{
array = var->GivItemList();
- bArray = TRUE;
+ bArray = true;
}
else
{
type = var->GivValInt();
- bArray = FALSE;
+ bArray = false;
}
var = var->GivNext();
if ( var != 0 )
{
- if ( !GetPoint(var, exception, pos) ) return TRUE;
- bNearest = TRUE;
+ if ( !GetPoint(var, exception, pos) ) return true;
+ bNearest = true;
}
min = 100000.0f;
@@ -479,7 +479,7 @@ BOOL rSearch(CBotVar* var, CBotVar* result, int& exception, void* user) {
result->SetPointer(pBest->RetBotVar());
}
- return TRUE;
+ return true;
}
@@ -522,7 +522,7 @@ CBotTypResult cRadar(CBotVar* &var, void* user) // Instruction "radar(type, angle, focus, min, max, sens, filter)".
-BOOL rRadar(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rRadar(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -533,7 +533,7 @@ BOOL rRadar(CBotVar* var, CBotVar* result, int& exception, void* user) RadarFilter filter;
float best, minDist, maxDist, sens, iAngle, angle, focus, d, a;
int type, oType, i;
- BOOL bArray;
+ bool bArray;
type = OBJECT_NULL;
angle = 0.0f;
@@ -548,12 +548,12 @@ BOOL rRadar(CBotVar* var, CBotVar* result, int& exception, void* user) if ( var->GivType() == CBotTypArrayPointer )
{
array = var->GivItemList();
- bArray = TRUE;
+ bArray = true;
}
else
{
type = var->GivValInt();
- bArray = FALSE;
+ bArray = false;
}
var = var->GivNext();
@@ -691,13 +691,13 @@ BOOL rRadar(CBotVar* var, CBotVar* result, int& exception, void* user) {
result->SetPointer(pBest->RetBotVar());
}
- return TRUE;
+ return true;
}
// Monitoring a task.
-BOOL Process(CScript* script, CBotVar* result, int &exception)
+bool Process(CScript* script, CBotVar* result, int &exception)
{
Error err;
@@ -707,21 +707,21 @@ BOOL Process(CScript* script, CBotVar* result, int &exception) delete script->m_primaryTask;
script->m_primaryTask = 0;
- script->m_bContinue = FALSE;
+ script->m_bContinue = false;
if ( err == ERR_STOP ) err = ERR_OK;
result->SetValInt(err); // indicates the error or ok
if ( err != ERR_OK && script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE; // it's all over
+ return true; // it's all over
}
script->m_primaryTask->EventProcess(script->m_event);
- script->m_bContinue = TRUE;
- return FALSE; // not done
+ script->m_bContinue = true;
+ return false; // not done
}
@@ -738,7 +738,7 @@ CBotTypResult cDetect(CBotVar* &var, void* user) // Instruction "detect(type)".
-BOOL rDetect(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rDetect(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -749,7 +749,7 @@ BOOL rDetect(CBotVar* var, CBotVar* result, int& exception, void* user) RadarFilter filter;
float bGoal, best, minDist, maxDist, sens, iAngle, angle, focus, d, a;
int type, oType, i;
- BOOL bArray;
+ bool bArray;
Error err;
exception = 0;
@@ -769,12 +769,12 @@ BOOL rDetect(CBotVar* var, CBotVar* result, int& exception, void* user) if ( var->GivType() == CBotTypArrayPointer )
{
array = var->GivItemList();
- bArray = TRUE;
+ bArray = true;
}
else
{
type = var->GivValInt();
- bArray = FALSE;
+ bArray = false;
}
}
@@ -899,14 +899,14 @@ BOOL rDetect(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
- if ( !Process(script, result, exception) ) return FALSE; // not finished
+ if ( !Process(script, result, exception) ) return false; // not finished
result->SetValFloat(script->m_returnValue);
- return TRUE;
+ return true;
}
@@ -926,14 +926,14 @@ CBotTypResult cDirection(CBotVar* &var, void* user) // Instruction "direction(pos)".
-BOOL rDirection(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rDirection(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
D3DVECTOR iPos, oPos;
float a, g;
- if ( !GetPoint(var, exception, oPos) ) return TRUE;
+ if ( !GetPoint(var, exception, oPos) ) return true;
iPos = pThis->RetPosition(0);
@@ -941,7 +941,7 @@ BOOL rDirection(CBotVar* var, CBotVar* result, int& exception, void* user) g = RotateAngle(oPos.x-iPos.x, iPos.z-oPos.z); // CW !
result->SetValFloat(-Direction(a, g)*180.0f/PI);
- return TRUE;
+ return true;
}
@@ -974,7 +974,7 @@ CBotTypResult cProduce(CBotVar* &var, void* user) // Instruction "produce(pos, angle, type, scriptName)".
-BOOL rProduce(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rProduce(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* object;
@@ -984,7 +984,7 @@ BOOL rProduce(CBotVar* var, CBotVar* result, int& exception, void* user) float angle;
ObjectType type;
- if ( !GetPoint(var, exception, pos) ) return TRUE;
+ if ( !GetPoint(var, exception, pos) ) return true;
angle = var->GivValFloat()*PI/180.0f;
var = var->GivNext();
@@ -1023,7 +1023,7 @@ BOOL rProduce(CBotVar* var, CBotVar* result, int& exception, void* user) {
delete object;
result->SetValInt(1); // error
- return TRUE;
+ return true;
}
}
else
@@ -1040,7 +1040,7 @@ BOOL rProduce(CBotVar* var, CBotVar* result, int& exception, void* user) {
delete object;
result->SetValInt(1); // error
- return TRUE;
+ return true;
}
egg = new CObject(script->m_iMan);
@@ -1052,14 +1052,14 @@ BOOL rProduce(CBotVar* var, CBotVar* result, int& exception, void* user) else
{
result->SetValInt(1); // impossible
- return TRUE;
+ return true;
}
- object->SetActivity(FALSE);
+ object->SetActivity(false);
object->ReadProgram(0, (char*)name);
object->RunProgram(0);
result->SetValInt(0); // no error
- return TRUE;
+ return true;
}
@@ -1084,32 +1084,32 @@ CBotTypResult cDistance(CBotVar* &var, void* user) // Instruction "distance(p1, p2)".
-BOOL rDistance(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rDistance(CBotVar* var, CBotVar* result, int& exception, void* user)
{
D3DVECTOR p1, p2;
float value;
- if ( !GetPoint(var, exception, p1) ) return TRUE;
- if ( !GetPoint(var, exception, p2) ) return TRUE;
+ if ( !GetPoint(var, exception, p1) ) return true;
+ if ( !GetPoint(var, exception, p2) ) return true;
value = Length(p1, p2);
result->SetValFloat(value/g_unit);
- return TRUE;
+ return true;
}
// Instruction "distance2d(p1, p2)".
-BOOL rDistance2d(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rDistance2d(CBotVar* var, CBotVar* result, int& exception, void* user)
{
D3DVECTOR p1, p2;
float value;
- if ( !GetPoint(var, exception, p1) ) return TRUE;
- if ( !GetPoint(var, exception, p2) ) return TRUE;
+ if ( !GetPoint(var, exception, p1) ) return true;
+ if ( !GetPoint(var, exception, p2) ) return true;
value = Length2d(p1, p2);
result->SetValFloat(value/g_unit);
- return TRUE;
+ return true;
}
@@ -1141,7 +1141,7 @@ CBotTypResult cSpace(CBotVar* &var, void* user) // Instruction "space(center, rMin, rMax, dist)".
-BOOL rSpace(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rSpace(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -1159,7 +1159,7 @@ BOOL rSpace(CBotVar* var, CBotVar* result, int& exception, void* user) }
else
{
- if ( !GetPoint(var, exception, center) ) return TRUE;
+ if ( !GetPoint(var, exception, center) ) return true;
if ( var != 0 )
{
@@ -1193,7 +1193,7 @@ BOOL rSpace(CBotVar* var, CBotVar* result, int& exception, void* user) pSub->SetValFloat(center.y/g_unit);
}
}
- return TRUE;
+ return true;
}
@@ -1218,27 +1218,27 @@ CBotTypResult cFlatGround(CBotVar* &var, void* user) // Instruction "flatground(center, rMax)".
-BOOL rFlatGround(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rFlatGround(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
D3DVECTOR center;
float rMax, dist;
- if ( !GetPoint(var, exception, center) ) return TRUE;
+ if ( !GetPoint(var, exception, center) ) return true;
rMax = var->GivValFloat()*g_unit;
var = var->GivNext();
dist = script->m_main->RetFlatZoneRadius(center, rMax, pThis);
result->SetValFloat(dist/g_unit);
- return TRUE;
+ return true;
}
// Instruction "wait(t)".
-BOOL rWait(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rWait(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
float value;
@@ -1259,9 +1259,9 @@ BOOL rWait(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1269,7 +1269,7 @@ BOOL rWait(CBotVar* var, CBotVar* result, int& exception, void* user) // Instruction "move(dist)".
-BOOL rMove(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rMove(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
float value;
@@ -1290,9 +1290,9 @@ BOOL rMove(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1300,7 +1300,7 @@ BOOL rMove(CBotVar* var, CBotVar* result, int& exception, void* user) // Instruction "turn(angle)".
-BOOL rTurn(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rTurn(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
float value;
@@ -1321,9 +1321,9 @@ BOOL rTurn(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1357,7 +1357,7 @@ CBotTypResult cGoto(CBotVar* &var, void* user) // Instruction "goto(pos, altitude, mode)".
-BOOL rGoto(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rGoto(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
D3DVECTOR pos;
@@ -1371,7 +1371,7 @@ BOOL rGoto(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_primaryTask == 0 ) // no task in progress?
{
script->m_primaryTask = new CTaskManager(script->m_iMan, script->m_object);
- if ( !GetPoint(var, exception, pos) ) return TRUE;
+ if ( !GetPoint(var, exception, pos) ) return true;
goal = TGG_DEFAULT;
crash = TGC_DEFAULT;
@@ -1403,9 +1403,9 @@ BOOL rGoto(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1413,7 +1413,7 @@ BOOL rGoto(CBotVar* var, CBotVar* result, int& exception, void* user) // Instruction "find(type)".
-BOOL rFind(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rFind(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
D3DVECTOR pos;
@@ -1427,7 +1427,7 @@ BOOL rFind(CBotVar* var, CBotVar* result, int& exception, void* user) D3DVECTOR iPos, oPos;
float best, minDist, maxDist, sens, iAngle, angle, focus, d, a;
int type, oType, i;
- BOOL bArray;
+ bool bArray;
exception = 0;
@@ -1443,12 +1443,12 @@ BOOL rFind(CBotVar* var, CBotVar* result, int& exception, void* user) if ( var->GivType() == CBotTypArrayPointer )
{
array = var->GivItemList();
- bArray = TRUE;
+ bArray = true;
}
else
{
type = var->GivValInt();
- bArray = FALSE;
+ bArray = false;
}
best = 100000.0f;
@@ -1526,7 +1526,7 @@ BOOL rFind(CBotVar* var, CBotVar* result, int& exception, void* user) if ( pBest == 0 )
{
exception = ERR_FIND_IMPOSSIBLE;
- return FALSE;
+ return false;
}
pos = pBest->RetPosition(0);
@@ -1544,9 +1544,9 @@ BOOL rFind(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1565,7 +1565,7 @@ CBotTypResult cGrabDrop(CBotVar* &var, void* user) // Instruction "grab(oper)".
-BOOL rGrab(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rGrab(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -1600,9 +1600,9 @@ BOOL rGrab(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1610,7 +1610,7 @@ BOOL rGrab(CBotVar* var, CBotVar* result, int& exception, void* user) // Instruction "drop(oper)".
-BOOL rDrop(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rDrop(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -1645,9 +1645,9 @@ BOOL rDrop(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1655,7 +1655,7 @@ BOOL rDrop(CBotVar* var, CBotVar* result, int& exception, void* user) // Instruction "sniff()".
-BOOL rSniff(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rSniff(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
Error err;
@@ -1674,9 +1674,9 @@ BOOL rSniff(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1700,7 +1700,7 @@ CBotTypResult cReceive(CBotVar* &var, void* user) // Instruction "receive(nom, power)".
-BOOL rReceive(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rReceive(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -1726,16 +1726,16 @@ BOOL rReceive(CBotVar* var, CBotVar* result, int& exception, void* user) var = var->GivNext();
}
- err = script->m_primaryTask->StartTaskInfo((char*)p, 0.0f, power, FALSE);
+ err = script->m_primaryTask->StartTaskInfo((char*)p, 0.0f, power, false);
if ( err != ERR_OK )
{
delete script->m_primaryTask;
script->m_primaryTask = 0;
result->SetInit(IS_NAN);
- return TRUE;
+ return true;
}
}
- if ( !Process(script, result, exception) ) return FALSE; // not finished
+ if ( !Process(script, result, exception) ) return false; // not finished
value = pThis->RetInfoReturn();
if ( value == NAN )
@@ -1746,7 +1746,7 @@ BOOL rReceive(CBotVar* var, CBotVar* result, int& exception, void* user) {
result->SetValFloat(value);
}
- return TRUE;
+ return true;
}
// Compilation of the instruction "send(nom, value, power)".
@@ -1771,7 +1771,7 @@ CBotTypResult cSend(CBotVar* &var, void* user) // Instruction "send(nom, value, power)".
-BOOL rSend(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rSend(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -1800,7 +1800,7 @@ BOOL rSend(CBotVar* var, CBotVar* result, int& exception, void* user) var = var->GivNext();
}
- err = script->m_primaryTask->StartTaskInfo((char*)p, value, power, TRUE);
+ err = script->m_primaryTask->StartTaskInfo((char*)p, value, power, true);
if ( err != ERR_OK )
{
delete script->m_primaryTask;
@@ -1809,9 +1809,9 @@ BOOL rSend(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -1872,7 +1872,7 @@ CBotTypResult cDeleteInfo(CBotVar* &var, void* user) // Instruction "deleteinfo(nom, power)".
-BOOL rDeleteInfo(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rDeleteInfo(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -1900,7 +1900,7 @@ BOOL rDeleteInfo(CBotVar* var, CBotVar* result, int& exception, void* user) if ( pInfo == 0 )
{
result->SetValFloat(0.0f); // false
- return TRUE;
+ return true;
}
total = pInfo->RetInfoTotal();
@@ -1911,11 +1911,11 @@ BOOL rDeleteInfo(CBotVar* var, CBotVar* result, int& exception, void* user) {
pInfo->DeleteInfo(i);
result->SetValFloat(1.0f); // true
- return TRUE;
+ return true;
}
}
result->SetValFloat(0.0f); // false
- return TRUE;
+ return true;
}
// Compilation of the instruction "testinfo(nom, power)".
@@ -1936,7 +1936,7 @@ CBotTypResult cTestInfo(CBotVar* &var, void* user) // Instruction "testinfo(nom, power)".
-BOOL rTestInfo(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rTestInfo(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -1963,8 +1963,8 @@ BOOL rTestInfo(CBotVar* var, CBotVar* result, int& exception, void* user) pInfo = SearchInfo(script, pThis, power);
if ( pInfo == 0 )
{
- result->SetValInt(FALSE);
- return TRUE;
+ result->SetValInt(false);
+ return true;
}
total = pInfo->RetInfoTotal();
@@ -1973,17 +1973,17 @@ BOOL rTestInfo(CBotVar* var, CBotVar* result, int& exception, void* user) info = pInfo->RetInfo(i);
if ( strcmp(info.name, p) == 0 )
{
- result->SetValInt(TRUE);
- return TRUE;
+ result->SetValInt(true);
+ return true;
}
}
- result->SetValInt(FALSE);
- return TRUE;
+ result->SetValInt(false);
+ return true;
}
// Instruction "thump()".
-BOOL rThump(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rThump(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
Error err;
@@ -2002,9 +2002,9 @@ BOOL rThump(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -2012,7 +2012,7 @@ BOOL rThump(CBotVar* var, CBotVar* result, int& exception, void* user) // Instruction "recycle()".
-BOOL rRecycle(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rRecycle(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
Error err;
@@ -2031,9 +2031,9 @@ BOOL rRecycle(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -2058,7 +2058,7 @@ CBotTypResult cShield(CBotVar* &var, void* user) // Instruction "shield(oper, radius)".
-BOOL rShield(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rShield(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -2107,7 +2107,7 @@ BOOL rShield(CBotVar* var, CBotVar* result, int& exception, void* user) }
}
- return TRUE;
+ return true;
}
// Compilation "fire(delay)".
@@ -2143,7 +2143,7 @@ CBotTypResult cFire(CBotVar* &var, void* user) // Instruction "fire(delay)".
-BOOL rFire(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rFire(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -2162,7 +2162,7 @@ BOOL rFire(CBotVar* var, CBotVar* result, int& exception, void* user) if ( type == OBJECT_ANT )
{
- if ( !GetPoint(var, exception, impact) ) return TRUE;
+ if ( !GetPoint(var, exception, impact) ) return true;
impact.y += pThis->RetWaterLevel();
err = script->m_primaryTask->StartTaskFireAnt(impact);
}
@@ -2182,7 +2182,7 @@ BOOL rFire(CBotVar* var, CBotVar* result, int& exception, void* user) delete script->m_primaryTask;
script->m_primaryTask = 0;
result->SetValInt(err); // shows the error
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -2190,7 +2190,7 @@ BOOL rFire(CBotVar* var, CBotVar* result, int& exception, void* user) // Instruction "aim(dir)".
-BOOL rAim(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rAim(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
float value;
@@ -2208,7 +2208,7 @@ BOOL rAim(CBotVar* var, CBotVar* result, int& exception, void* user) delete script->m_primaryTask;
script->m_primaryTask = 0;
result->SetValInt(err); // shows the error
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -2233,7 +2233,7 @@ CBotTypResult cMotor(CBotVar* &var, void* user) // Instruction "motor(left, right)".
-BOOL rMotor(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rMotor(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CObject* pThis = (CObject*)user;
CPhysics* physics = ((CObject*)user)->RetPhysics();
@@ -2260,12 +2260,12 @@ BOOL rMotor(CBotVar* var, CBotVar* result, int& exception, void* user) physics->SetMotorSpeedX(speed); // forward/backward
physics->SetMotorSpeedZ(turn); // turns
- return TRUE;
+ return true;
}
// Instruction "jet(power)".
-BOOL rJet(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rJet(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CPhysics* physics = ((CObject*)user)->RetPhysics();
float value;
@@ -2273,7 +2273,7 @@ BOOL rJet(CBotVar* var, CBotVar* result, int& exception, void* user) value = var->GivValFloat();
physics->SetMotorSpeedY(value);
- return TRUE;
+ return true;
}
// Compilation of the instruction "topo(pos)".
@@ -2292,7 +2292,7 @@ CBotTypResult cTopo(CBotVar* &var, void* user) // Instruction "topo(pos)".
-BOOL rTopo(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rTopo(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
D3DVECTOR pos;
@@ -2300,12 +2300,12 @@ BOOL rTopo(CBotVar* var, CBotVar* result, int& exception, void* user) exception = 0;
- if ( !GetPoint(var, exception, pos) ) return TRUE;
+ if ( !GetPoint(var, exception, pos) ) return true;
level = script->m_terrain->RetFloorLevel(pos);
level -= script->m_water->RetLevel();
result->SetValFloat(level/g_unit);
- return TRUE;
+ return true;
}
// Compilation of the instruction "message(string, type)".
@@ -2327,7 +2327,7 @@ CBotTypResult cMessage(CBotVar* &var, void* user) // Instruction "message(string, type)".
-BOOL rMessage(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rMessage(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CBotString cbs;
@@ -2347,12 +2347,12 @@ BOOL rMessage(CBotVar* var, CBotVar* result, int& exception, void* user) script->m_displayText->DisplayText((char*)p, script->m_object, 10.0f, type);
script->m_main->CheckEndMessage((char*)p);
- return TRUE;
+ return true;
}
// Instruction "cmdline(rank)".
-BOOL rCmdline(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rCmdline(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -2363,12 +2363,12 @@ BOOL rCmdline(CBotVar* var, CBotVar* result, int& exception, void* user) value = pThis->RetCmdLine(rank);
result->SetValFloat(value);
- return TRUE;
+ return true;
}
// Instruction "ismovie()".
-BOOL rIsMovie(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rIsMovie(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
float value;
@@ -2376,12 +2376,12 @@ BOOL rIsMovie(CBotVar* var, CBotVar* result, int& exception, void* user) value = script->m_main->RetMovieLock()?1.0f:0.0f;
result->SetValFloat(value);
- return TRUE;
+ return true;
}
// Instruction "errmode(mode)".
-BOOL rErrMode(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rErrMode(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
int value;
@@ -2391,12 +2391,12 @@ BOOL rErrMode(CBotVar* var, CBotVar* result, int& exception, void* user) if ( value > 1 ) value = 1;
script->m_errMode = value;
- return TRUE;
+ return true;
}
// Instruction "ipf(num)".
-BOOL rIPF(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rIPF(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
int value;
@@ -2406,19 +2406,19 @@ BOOL rIPF(CBotVar* var, CBotVar* result, int& exception, void* user) if ( value > 10000 ) value = 10000;
script->m_ipf = value;
- return TRUE;
+ return true;
}
// Instruction "abstime()".
-BOOL rAbsTime(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rAbsTime(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
float value;
value = script->m_main->RetGameTime();
result->SetValFloat(value);
- return TRUE;
+ return true;
}
@@ -2451,7 +2451,7 @@ void PrepareFilename(CBotString &filename, char *dir) // Instruction "deletefile(filename)".
-BOOL rDeleteFile(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rDeleteFile(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CBotString cbs;
@@ -2464,7 +2464,7 @@ BOOL rDeleteFile(CBotVar* var, CBotVar* result, int& exception, void* user) p = cbs;
DeleteFile(p);
- return TRUE;
+ return true;
}
// Compilation of the instruction "pendown(color, width)".
@@ -2485,7 +2485,7 @@ CBotTypResult cPenDown(CBotVar* &var, void* user) // Instruction "pendown(color, width)".
-BOOL rPenDown(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rPenDown(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -2515,7 +2515,7 @@ BOOL rPenDown(CBotVar* var, CBotVar* result, int& exception, void* user) pThis->SetTraceWidth(width);
}
}
- pThis->SetTraceDown(TRUE);
+ pThis->SetTraceDown(true);
script->m_primaryTask = new CTaskManager(script->m_iMan, script->m_object);
err = script->m_primaryTask->StartTaskPen(pThis->RetTraceDown(), pThis->RetTraceColor());
@@ -2527,9 +2527,9 @@ BOOL rPenDown(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -2552,15 +2552,15 @@ BOOL rPenDown(CBotVar* var, CBotVar* result, int& exception, void* user) pThis->SetTraceWidth(width);
}
}
- pThis->SetTraceDown(TRUE);
+ pThis->SetTraceDown(true);
- return TRUE;
+ return true;
}
}
// Instruction "penup()".
-BOOL rPenUp(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rPenUp(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CObject* pThis = (CObject*)user;
@@ -2572,7 +2572,7 @@ BOOL rPenUp(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_primaryTask == 0 ) // no task in progress?
{
- pThis->SetTraceDown(FALSE);
+ pThis->SetTraceDown(false);
script->m_primaryTask = new CTaskManager(script->m_iMan, script->m_object);
err = script->m_primaryTask->StartTaskPen(pThis->RetTraceDown(), pThis->RetTraceColor());
@@ -2584,23 +2584,23 @@ BOOL rPenUp(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
}
else
{
- pThis->SetTraceDown(FALSE);
- return TRUE;
+ pThis->SetTraceDown(false);
+ return true;
}
}
// Instruction "pencolor()".
-BOOL rPenColor(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rPenColor(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CScript* script = ((CObject*)user)->RetRunScript();
CPhysics* physics = ((CObject*)user)->RetPhysics();
@@ -2629,9 +2629,9 @@ BOOL rPenColor(CBotVar* var, CBotVar* result, int& exception, void* user) if ( script->m_errMode == ERM_STOP )
{
exception = err;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
}
return Process(script, result, exception);
@@ -2643,13 +2643,13 @@ BOOL rPenColor(CBotVar* var, CBotVar* result, int& exception, void* user) if ( color > 17 ) color = 17;
pThis->SetTraceColor(color);
- return TRUE;
+ return true;
}
}
// Instruction "penwidth()".
-BOOL rPenWidth(CBotVar* var, CBotVar* result, int& exception, void* user)
+bool rPenWidth(CBotVar* var, CBotVar* result, int& exception, void* user)
{
CObject* pThis = (CObject*)user;
float width;
@@ -2658,7 +2658,7 @@ BOOL rPenWidth(CBotVar* var, CBotVar* result, int& exception, void* user) if ( width < 0.1f ) width = 0.1f;
if ( width > 1.0f ) width = 1.0f;
pThis->SetTraceWidth(width);
- return TRUE;
+ return true;
}
@@ -2685,9 +2685,9 @@ CScript::CScript(CInstanceManager* iMan, CObject* object, CTaskManager** seconda m_errMode = ERM_STOP;
m_len = 0;
m_script = 0;
- m_bRun = FALSE;
- m_bStepMode = FALSE;
- m_bCompile = FALSE;
+ m_bRun = false;
+ m_bStepMode = false;
+ m_bCompile = false;
m_title[0] = 0;
m_cursor1 = 0;
m_cursor2 = 0;
@@ -2780,12 +2780,12 @@ void CScript::PutScript(CEdit* edit, char* name) edit->SetCursor(m_cursor2, m_cursor1);
edit->ShowSelect();
}
- edit->SetFocus(TRUE);
+ edit->SetFocus(true);
}
// The script takes a paved text.
-BOOL CScript::GetScript(CEdit* edit)
+bool CScript::GetScript(CEdit* edit)
{
int len;
@@ -2803,46 +2803,46 @@ BOOL CScript::GetScript(CEdit* edit) {
edit->SetCursor(m_cursor2, m_cursor1);
edit->ShowSelect();
- edit->SetFocus(TRUE);
- return FALSE;
+ edit->SetFocus(true);
+ return false;
}
if ( !Compile() )
{
edit->SetCursor(m_cursor2, m_cursor1);
edit->ShowSelect();
- edit->SetFocus(TRUE);
- return FALSE;
+ edit->SetFocus(true);
+ return false;
}
- return TRUE;
+ return true;
}
// Indicates whether a program is compiled correctly.
-BOOL CScript::RetCompile()
+bool CScript::RetCompile()
{
return m_bCompile;
}
// Indicates whether the program is empty.
-BOOL CScript::IsEmpty()
+bool CScript::IsEmpty()
{
int i;
for ( i=0 ; i<m_len ; i++ )
{
if ( m_script[i] != ' ' &&
- m_script[i] != '\n' ) return FALSE;
+ m_script[i] != '\n' ) return false;
}
- return TRUE;
+ return true;
}
// Checks if a program does not contain the prohibited instructions
// and if it contains well at least once every mandatory instructions.
-BOOL CScript::CheckToken()
+bool CScript::CheckToken()
{
CBotToken* bt;
CBotString bs;
@@ -2850,12 +2850,12 @@ BOOL CScript::CheckToken() int error, type, cursor1, cursor2, i;
char used[100];
- if ( !m_object->RetCheckToken() ) return TRUE;
+ if ( !m_object->RetCheckToken() ) return true;
m_error = 0;
m_title[0] = 0;
m_token[0] = 0;
- m_bCompile = FALSE;
+ m_bCompile = false;
for ( i=0 ; i<m_main->RetObligatoryToken() ; i++ )
{
@@ -2885,7 +2885,7 @@ BOOL CScript::CheckToken() m_cursor2 = cursor2;
strcpy(m_title, "<erreur>");
CBotToken::Delete(bt);
- return FALSE;
+ return false;
}
bt = bt->GivNext();
@@ -2900,17 +2900,17 @@ BOOL CScript::CheckToken() m_error = ERR_OBLIGATORYTOKEN;
strcpy(m_title, "<erreur>");
CBotToken::Delete(bt);
- return FALSE;
+ return false;
}
}
CBotToken::Delete(bt);
- return TRUE;
+ return true;
}
// Compile the script of a paved text.
-BOOL CScript::Compile()
+bool CScript::Compile()
{
CBotStringArray liste;
int i;
@@ -2920,13 +2920,13 @@ BOOL CScript::Compile() m_cursor1 = 0;
m_cursor2 = 0;
m_title[0] = 0;
- m_bCompile = FALSE;
+ m_bCompile = false;
if ( IsEmpty() ) // program exist?
{
delete m_botProg;
m_botProg = 0;
- return TRUE;
+ return true;
}
if ( m_botProg == 0 )
@@ -2944,7 +2944,7 @@ BOOL CScript::Compile() {
p = liste[0];
i = 0;
- while ( TRUE )
+ while ( true )
{
if ( p[i] == 0 || p[i] == '(' ) break;
if ( i >= 20 )
@@ -2959,8 +2959,8 @@ BOOL CScript::Compile() }
m_title[i] = 0;
}
- m_bCompile = TRUE;
- return TRUE;
+ m_bCompile = true;
+ return true;
}
else
{
@@ -2976,7 +2976,7 @@ BOOL CScript::Compile() m_cursor1 = m_cursor2 = 0;
}
strcpy(m_title, "<erreur>");
- return FALSE;
+ return false;
}
}
@@ -2991,7 +2991,7 @@ void CScript::GetTitle(char* buffer) // Choice of mode of execution.
-void CScript::SetStepMode(BOOL bStep)
+void CScript::SetStepMode(bool bStep)
{
m_bStepMode = bStep;
}
@@ -2999,16 +2999,16 @@ void CScript::SetStepMode(BOOL bStep) // Runs the program from the beginning.
-BOOL CScript::Run()
+bool CScript::Run()
{
- if( m_botProg == 0 ) return FALSE;
- if ( m_script == 0 || m_len == 0 ) return FALSE;
+ if( m_botProg == 0 ) return false;
+ if ( m_script == 0 || m_len == 0 ) return false;
- if ( !m_botProg->Start(m_title) ) return FALSE;
+ if ( !m_botProg->Start(m_title) ) return false;
m_object->SetRunScript(this);
- m_bRun = TRUE;
- m_bContinue = FALSE;
+ m_bRun = true;
+ m_bContinue = false;
m_ipf = CBOT_IPF;
m_errMode = ERM_STOP;
@@ -3019,16 +3019,16 @@ BOOL CScript::Run() Step(newEvent);
}
- return TRUE;
+ return true;
}
// Continues the execution of current program.
-// Returns TRUE when execution is finished.
+// Returns true when execution is finished.
-BOOL CScript::Continue(const Event &event)
+bool CScript::Continue(const Event &event)
{
- if( m_botProg == 0 ) return TRUE;
- if ( !m_bRun ) return TRUE;
+ if( m_botProg == 0 ) return true;
+ if ( !m_bRun ) return true;
m_event = event;
@@ -3049,7 +3049,7 @@ BOOL CScript::Continue(const Event &event) {
m_cursor1 = m_cursor2 = 0;
}
- m_bRun = FALSE;
+ m_bRun = false;
if ( m_error != 0 && m_errMode == ERM_STOP )
{
@@ -3057,16 +3057,16 @@ BOOL CScript::Continue(const Event &event) GetError(s);
m_displayText->DisplayText(s, m_object, 10.0f, TT_ERROR);
}
- m_engine->SetPause(TRUE); // gives pause
- return TRUE;
+ m_engine->SetPause(true); // gives pause
+ return true;
}
if ( !m_bContinue )
{
- m_engine->SetPause(TRUE); // gives pause
+ m_engine->SetPause(true); // gives pause
}
}
- return FALSE;
+ return false;
}
if ( m_botProg->Run(m_object, m_ipf) )
@@ -3082,7 +3082,7 @@ BOOL CScript::Continue(const Event &event) {
m_cursor1 = m_cursor2 = 0;
}
- m_bRun = FALSE;
+ m_bRun = false;
if ( m_error != 0 && m_errMode == ERM_STOP )
{
@@ -3090,24 +3090,24 @@ BOOL CScript::Continue(const Event &event) GetError(s);
m_displayText->DisplayText(s, m_object, 10.0f, TT_ERROR);
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// Continues the execution of current program.
-// Returns TRUE when execution is finished.
+// Returns true when execution is finished.
-BOOL CScript::Step(const Event &event)
+bool CScript::Step(const Event &event)
{
- if( m_botProg == 0 ) return TRUE;
- if ( !m_bRun ) return TRUE;
- if ( !m_bStepMode ) return FALSE;
+ if( m_botProg == 0 ) return true;
+ if ( !m_bRun ) return true;
+ if ( !m_bStepMode ) return false;
- m_engine->SetPause(FALSE);
+ m_engine->SetPause(false);
m_engine->StepSimul(0.01f); // advance of 10ms
- m_engine->SetPause(TRUE);
+ m_engine->SetPause(true);
m_event = event;
@@ -3124,7 +3124,7 @@ BOOL CScript::Step(const Event &event) {
m_cursor1 = m_cursor2 = 0;
}
- m_bRun = FALSE;
+ m_bRun = false;
if ( m_error != 0 && m_errMode == ERM_STOP )
{
@@ -3132,14 +3132,14 @@ BOOL CScript::Step(const Event &event) GetError(s);
m_displayText->DisplayText(s, m_object, 10.0f, TT_ERROR);
}
- return TRUE;
+ return true;
}
if ( m_bContinue ) // instuction "move", "goto", etc. ?
{
- m_engine->SetPause(FALSE); // removes the pause
+ m_engine->SetPause(false); // removes the pause
}
- return FALSE;
+ return false;
}
// Stops the program.
@@ -3160,19 +3160,19 @@ void CScript::Stop() m_primaryTask = 0;
}
- m_bRun = FALSE;
+ m_bRun = false;
}
// Indicates whether the program runs.
-BOOL CScript::IsRunning()
+bool CScript::IsRunning()
{
return m_bRun;
}
// Indicates whether the program continues a step.
-BOOL CScript::IsContinue()
+bool CScript::IsContinue()
{
return m_bContinue;
}
@@ -3180,14 +3180,14 @@ BOOL CScript::IsContinue() // Gives the position of the cursor during the execution.
-BOOL CScript::GetCursor(int &cursor1, int &cursor2)
+bool CScript::GetCursor(int &cursor1, int &cursor2)
{
const char* funcName;
cursor1 = cursor2 = 0;
- if( m_botProg == 0 ) return FALSE;
- if ( !m_bRun ) return FALSE;
+ if( m_botProg == 0 ) return false;
+ if ( !m_bRun ) return false;
m_botProg->GetRunPos(funcName, cursor1, cursor2);
if ( cursor1 < 0 || cursor1 > m_len ||
@@ -3196,13 +3196,13 @@ BOOL CScript::GetCursor(int &cursor1, int &cursor2) cursor1 = 0;
cursor2 = 0;
}
- return TRUE;
+ return true;
}
// Put of the variables in a list.
-void PutList(char *baseName, BOOL bArray, CBotVar *var, CList *list, int &rankList)
+void PutList(char *baseName, bool bArray, CBotVar *var, CList *list, int &rankList)
{
CBotString bs;
CBotVar *svar, *pStatic;
@@ -3221,7 +3221,7 @@ void PutList(char *baseName, BOOL bArray, CBotVar *var, CList *list, int &rankLi index = 0;
while ( var != 0 )
{
- var->Maj(NULL, FALSE);
+ var->Maj(NULL, false);
pStatic = var->GivStaticVar(); // finds the static element
bs = pStatic->GivName(); // variable name
@@ -3269,13 +3269,13 @@ void PutList(char *baseName, BOOL bArray, CBotVar *var, CList *list, int &rankLi else if ( type == CBotTypArrayPointer )
{
svar = pStatic->GivItemList();
- PutList(varName, TRUE, svar, list, rankList);
+ PutList(varName, true, svar, list, rankList);
}
else if ( type == CBotTypClass ||
type == CBotTypPointer )
{
svar = pStatic->GivItemList();
- PutList(varName, FALSE, svar, list, rankList);
+ PutList(varName, false, svar, list, rankList);
}
else
{
@@ -3307,12 +3307,12 @@ void CScript::UpdateList(CList* list) level = 0;
rank = 0;
- while ( TRUE )
+ while ( true )
{
var = m_botProg->GivStackVars(funcName, level--);
if ( funcName != progName ) break;
- PutList("", FALSE, var, list, rank);
+ PutList("", false, var, list, rank);
}
if ( total == list->RetTotal() ) // same total?
@@ -3417,7 +3417,7 @@ int SearchToken(char* script, char* token) void DeleteToken(char* script, int pos, int len)
{
- while ( TRUE )
+ while ( true )
{
script[pos] = script[pos+len];
if ( script[pos++] == 0 ) break;
@@ -3441,7 +3441,7 @@ void InsertToken(char* script, int pos, char* token) // Introduces a virus into a program.
-BOOL CScript::IntroduceVirus()
+bool CScript::IntroduceVirus()
{
int i, start, iFound;
int found[11*2];
@@ -3472,7 +3472,7 @@ BOOL CScript::IntroduceVirus() found[iFound++] = start;
}
}
- if ( iFound == 0 ) return FALSE;
+ if ( iFound == 0 ) return false;
i = (rand()%(iFound/2))*2;
start = found[i+1];
@@ -3488,7 +3488,7 @@ BOOL CScript::IntroduceVirus() m_len = strlen(m_script);
Compile(); // recompile with the virus
- return TRUE;
+ return true;
}
@@ -3545,7 +3545,7 @@ void CScript::New(CEdit* edit, char* name) else strcpy(text, name);
sprintf(script, "extern void object::%s()\n{\n\t\n\t\n\t\n}\n", text);
- edit->SetText(script, FALSE);
+ edit->SetText(script, false);
if ( strcmp(text, res) == 0 )
{
@@ -3568,7 +3568,7 @@ void CScript::New(CEdit* edit, char* name) edit->SetCursor(cursor2, cursor1);
edit->ShowSelect();
- edit->SetFocus(TRUE);
+ edit->SetFocus(true);
sf = m_main->RetScriptFile();
if ( sf[0] != 0 ) // Load an empty program specific?
@@ -3590,7 +3590,7 @@ void CScript::New(CEdit* edit, char* name) cursor1 = 0;
i = 0;
j = 0;
- while ( TRUE )
+ while ( true )
{
if ( buffer[i] == 0 ) break;
@@ -3625,12 +3625,12 @@ void CScript::New(CEdit* edit, char* name) script[j++] = buffer[i++];
}
script[j] = 0;
- edit->SetText(script, FALSE);
+ edit->SetText(script, false);
cursor2 = cursor1;
edit->SetCursor(cursor2, cursor1);
edit->ShowSelect();
- edit->SetFocus(TRUE);
+ edit->SetFocus(true);
}
}
@@ -3640,20 +3640,20 @@ void CScript::New(CEdit* edit, char* name) // Provided a script for all parts.
-BOOL CScript::SendScript(char* text)
+bool CScript::SendScript(char* text)
{
m_len = strlen(text);
m_script = (char*)malloc(sizeof(char)*(m_len+1));
strcpy(m_script, text);
- if ( !CheckToken() ) return FALSE;
- if ( !Compile() ) return FALSE;
+ if ( !CheckToken() ) return false;
+ if ( !Compile() ) return false;
- return TRUE;
+ return true;
}
// Reads a script as a text file.
-BOOL CScript::ReadScript(char* filename)
+bool CScript::ReadScript(char* filename)
{
FILE* file;
CEdit* edit;
@@ -3671,7 +3671,7 @@ BOOL CScript::ReadScript(char* filename) }
file = fopen(name, "rb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
fclose(file);
delete m_script;
@@ -3683,12 +3683,12 @@ BOOL CScript::ReadScript(char* filename) edit->ReadText(name);
GetScript(edit);
m_interface->DeleteControl(EVENT_EDIT9);
- return TRUE;
+ return true;
}
// Writes a script as a text file.
-BOOL CScript::WriteScript(char* filename)
+bool CScript::WriteScript(char* filename)
{
CEdit* edit;
char name[100];
@@ -3706,7 +3706,7 @@ BOOL CScript::WriteScript(char* filename) if ( m_script == 0 )
{
remove(filename);
- return FALSE;
+ return false;
}
edit = m_interface->CreateEdit(FPOINT(0.0f, 0.0f), FPOINT(0.0f, 0.0f), 0, EVENT_EDIT9);
@@ -3715,13 +3715,13 @@ BOOL CScript::WriteScript(char* filename) edit->SetText(m_script);
edit->WriteText(name);
m_interface->DeleteControl(EVENT_EDIT9);
- return TRUE;
+ return true;
}
// Reads a stack of script by execution as a file.
-BOOL CScript::ReadStack(FILE *file)
+bool CScript::ReadStack(FILE *file)
{
int nb;
@@ -3729,18 +3729,18 @@ BOOL CScript::ReadStack(FILE *file) fRead(&m_ipf, sizeof(int), 1, file);
fRead(&m_errMode, sizeof(int), 1, file);
- if ( m_botProg == 0 ) return FALSE;
- if ( !m_botProg->RestoreState(file) ) return FALSE;
+ if ( m_botProg == 0 ) return false;
+ if ( !m_botProg->RestoreState(file) ) return false;
m_object->SetRunScript(this);
- m_bRun = TRUE;
- m_bContinue = FALSE;
- return TRUE;
+ m_bRun = true;
+ m_bContinue = false;
+ return true;
}
// Writes a stack of script by execution as a file.
-BOOL CScript::WriteStack(FILE *file)
+bool CScript::WriteStack(FILE *file)
{
int nb;
@@ -3755,9 +3755,9 @@ BOOL CScript::WriteStack(FILE *file) // Compares two scripts.
-BOOL CScript::Compare(CScript* other)
+bool CScript::Compare(CScript* other)
{
- if ( m_len != other->m_len ) return FALSE;
+ if ( m_len != other->m_len ) return false;
return ( strcmp(m_script, other->m_script) == 0 );
}
diff --git a/src/script/script.h b/src/script/script.h index ac81916..5500218 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -46,41 +46,41 @@ public: static void InitFonctions();
void PutScript(CEdit* edit, char* name);
- BOOL GetScript(CEdit* edit);
- BOOL RetCompile();
+ bool GetScript(CEdit* edit);
+ bool RetCompile();
void GetTitle(char* buffer);
- void SetStepMode(BOOL bStep);
- BOOL Run();
- BOOL Continue(const Event &event);
- BOOL Step(const Event &event);
+ void SetStepMode(bool bStep);
+ bool Run();
+ bool Continue(const Event &event);
+ bool Step(const Event &event);
void Stop();
- BOOL IsRunning();
- BOOL IsContinue();
- BOOL GetCursor(int &cursor1, int &cursor2);
+ bool IsRunning();
+ bool IsContinue();
+ bool GetCursor(int &cursor1, int &cursor2);
void UpdateList(CList* list);
void ColorizeScript(CEdit* edit);
- BOOL IntroduceVirus();
+ bool IntroduceVirus();
int RetError();
void GetError(char* buffer);
void New(CEdit* edit, char* name);
- BOOL SendScript(char* text);
- BOOL ReadScript(char* filename);
- BOOL WriteScript(char* filename);
- BOOL ReadStack(FILE *file);
- BOOL WriteStack(FILE *file);
- BOOL Compare(CScript* other);
+ bool SendScript(char* text);
+ bool ReadScript(char* filename);
+ bool WriteScript(char* filename);
+ bool ReadStack(FILE *file);
+ bool WriteStack(FILE *file);
+ bool Compare(CScript* other);
void SetFilename(char *filename);
char* RetFilename();
protected:
- BOOL IsEmpty();
- BOOL CheckToken();
- BOOL Compile();
+ bool IsEmpty();
+ bool CheckToken();
+ bool Compile();
public:
CInstanceManager* m_iMan;
@@ -99,10 +99,10 @@ public: int m_errMode; // what to do in case of error
int m_len; // length of the script (without <0>)
char* m_script; // script ends with <0>
- BOOL m_bRun; // program during execution?
- BOOL m_bStepMode; // step by step
- BOOL m_bContinue; // external function to continue
- BOOL m_bCompile; // compilation ok?
+ bool m_bRun; // program during execution?
+ bool m_bStepMode; // step by step
+ bool m_bContinue; // external function to continue
+ bool m_bCompile; // compilation ok?
char m_title[50]; // script title
char m_filename[50]; // file name
char m_token[50]; // missing instruction
diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp index fadfeaa..5965c50 100644 --- a/src/sound/sound.cpp +++ b/src/sound/sound.cpp @@ -193,10 +193,10 @@ void InitMidiVolume(int volume) // Changes the volume of audio CD.
// The volume is between 0 and 20!
-// Crashing in Vista. The current craft (if _SOUNDTRACKS = TRUE) no longer crashes,
+// Crashing in Vista. The current craft (if _SOUNDTRACKS = true) no longer crashes,
// but this is not the correct volume which is modified!
-BOOL InitAudioTrackVolume(int volume)
+bool InitAudioTrackVolume(int volume)
{
#if _SOUNDTRACKS
MMRESULT rc; // Return code.
@@ -215,7 +215,7 @@ BOOL InitAudioTrackVolume(int volume) rc = mixerOpen(&hMixer, 0,0,0,0);
if ( rc != MMSYSERR_NOERROR )
{
- return FALSE; // Couldn't open the mixer.
+ return false; // Couldn't open the mixer.
}
// Initialize MIXERLINE structure.
@@ -231,7 +231,7 @@ BOOL InitAudioTrackVolume(int volume) MIXER_GETLINEINFOF_COMPONENTTYPE);
if ( rc != MMSYSERR_NOERROR )
{
- return FALSE; // Couldn't get the mixer line.
+ return false; // Couldn't get the mixer line.
}
// Get the control.
@@ -251,7 +251,7 @@ BOOL InitAudioTrackVolume(int volume) //? MIXER_GETLINECONTROLSF_ALL);
if ( rc != MMSYSERR_NOERROR )
{
- return FALSE; // Couldn't get the control.
+ return false; // Couldn't get the control.
}
// After successfully getting the peakmeter control, the volume range
@@ -279,11 +279,11 @@ BOOL InitAudioTrackVolume(int volume) MIXER_SETCONTROLDETAILSF_VALUE);
if ( rc != MMSYSERR_NOERROR )
{
- return FALSE; // Couldn't get the current volume.
+ return false; // Couldn't get the current volume.
}
#endif
- return TRUE;
+ return true;
}
@@ -299,11 +299,11 @@ CSound::CSound(CInstanceManager* iMan) m_iMan = iMan;
m_iMan->AddInstance(CLASS_SOUND, this);
- m_bEnable = FALSE;
- m_bState = FALSE;
- m_bAudioTrack = TRUE;
- m_ctrl3D = TRUE;
- m_bDebugMode = FALSE;
+ m_bEnable = false;
+ m_bState = false;
+ m_bAudioTrack = true;
+ m_ctrl3D = true;
+ m_bDebugMode = false;
m_MidiDeviceID = 0;
m_MIDIMusic = 0;
m_audioVolume = 20;
@@ -322,7 +322,7 @@ CSound::CSound(CInstanceManager* iMan) ZeroMemory(m_channel, sizeof(SoundChannel)*MAXSOUND);
for ( i=0 ; i<MAXSOUND ; i++ )
{
- m_channel[i].bUsed = FALSE;
+ m_channel[i].bUsed = false;
}
for ( i=0 ; i<MAXFILES ; i++ )
@@ -350,7 +350,7 @@ CSound::~CSound() m_channel[i].soundBuffer->Stop();
m_channel[i].soundBuffer->Release();
m_channel[i].soundBuffer = 0;
- m_channel[i].bUsed = FALSE;
+ m_channel[i].bUsed = false;
}
}
@@ -370,7 +370,7 @@ CSound::~CSound() // Specifies whether you are in debug mode.
-void CSound::SetDebugMode(BOOL bMode)
+void CSound::SetDebugMode(bool bMode)
{
m_bDebugMode = bMode;
}
@@ -378,7 +378,7 @@ void CSound::SetDebugMode(BOOL bMode) // Initializes DirectSound.
-BOOL CSound::Create(HWND hWnd, BOOL b3D)
+bool CSound::Create(HWND hWnd, bool b3D)
{
LPDIRECTSOUNDBUFFER primary;
DSBUFFERDESC dsbdesc;
@@ -389,16 +389,16 @@ BOOL CSound::Create(HWND hWnd, BOOL b3D) if ( !DirectSoundCreate(NULL, &m_lpDS, NULL) == DS_OK )
{
OutputDebugString("Fatal error: DirectSoundCreate\n");
- m_bEnable = FALSE;
- return FALSE;
+ m_bEnable = false;
+ return false;
}
//? m_lpDS->SetCooperativeLevel(hWnd, DSSCL_NORMAL);
m_lpDS->SetCooperativeLevel(hWnd, DSSCL_PRIORITY);
- if ( !RetSound3DCap() ) b3D = FALSE;
+ if ( !RetSound3DCap() ) b3D = false;
- m_ctrl3D = FALSE;
+ m_ctrl3D = false;
if ( b3D )
{
// Obtain primary buffer, asking it for 3D control.
@@ -408,7 +408,7 @@ BOOL CSound::Create(HWND hWnd, BOOL b3D) hr = m_lpDS->CreateSoundBuffer( &dsbdesc, &primary, NULL );
if ( hr == S_OK )
{
- m_ctrl3D = TRUE;
+ m_ctrl3D = true;
}
}
@@ -421,9 +421,9 @@ BOOL CSound::Create(HWND hWnd, BOOL b3D) hr = m_lpDS->CreateSoundBuffer( &dsbdesc, &primary, NULL );
if ( hr != S_OK )
{
- return FALSE;
+ return false;
}
- m_ctrl3D = FALSE;
+ m_ctrl3D = false;
}
if ( m_ctrl3D )
@@ -433,7 +433,7 @@ BOOL CSound::Create(HWND hWnd, BOOL b3D) if ( hr != S_OK )
{
primary->Release();
- return FALSE;
+ return false;
}
}
@@ -473,15 +473,15 @@ BOOL CSound::Create(HWND hWnd, BOOL b3D) }
}
- m_bEnable = TRUE;
+ m_bEnable = true;
m_hWnd = hWnd;
- return TRUE;
+ return true;
}
// Indicates whether to play sounds in 3D or not.
-void CSound::SetSound3D(BOOL bMode)
+void CSound::SetSound3D(bool bMode)
{
StopAll();
@@ -500,14 +500,14 @@ void CSound::SetSound3D(BOOL bMode) Create(m_hWnd, bMode);
}
-BOOL CSound::RetSound3D()
+bool CSound::RetSound3D()
{
return m_ctrl3D;
}
// Indicates whether it is possible to play sounds in 3D.
-BOOL CSound::RetSound3DCap()
+bool CSound::RetSound3DCap()
{
DSCAPS dscaps;
HRESULT hr;
@@ -515,7 +515,7 @@ BOOL CSound::RetSound3DCap() ZeroMemory( &dscaps, sizeof(DSCAPS) );
dscaps.dwSize = sizeof(DSCAPS);
hr = m_lpDS->GetCaps(&dscaps);
- if ( hr != DS_OK ) return FALSE;
+ if ( hr != DS_OK ) return false;
return ( dscaps.dwMaxHw3DAllBuffers > 0 );
}
@@ -524,7 +524,7 @@ BOOL CSound::RetSound3DCap() // Returns the state of DirectSound.
-BOOL CSound::RetEnable()
+bool CSound::RetEnable()
{
return m_bEnable;
}
@@ -532,7 +532,7 @@ BOOL CSound::RetEnable() // Switches on or off the sound.
-void CSound::SetState(BOOL bState)
+void CSound::SetState(bool bState)
{
m_bState = bState;
}
@@ -546,7 +546,7 @@ void CSound::SetCDpath(char *path) // Switches on or off the CD-audio music.
-void CSound::SetAudioTrack(BOOL bAudio)
+void CSound::SetAudioTrack(bool bAudio)
{
m_bAudioTrack = bAudio;
}
@@ -584,7 +584,7 @@ int CSound::RetMidiVolume() // Reads a file.
-BOOL CSound::ReadFile(Sound sound, char *metaname, char *filename)
+bool CSound::ReadFile(Sound sound, char *metaname, char *filename)
{
WaveHeader wavHdr;
DWORD size;
@@ -592,7 +592,7 @@ BOOL CSound::ReadFile(Sound sound, char *metaname, char *filename) // Open the wave file.
err = g_metafile.Open(metaname, filename);
- if ( err != 0 ) return FALSE;
+ if ( err != 0 ) return false;
// Read in the wave header.
g_metafile.Read(&wavHdr, sizeof(wavHdr));
@@ -611,7 +611,7 @@ BOOL CSound::ReadFile(Sound sound, char *metaname, char *filename) // Close out the wave file.
g_metafile.Close();
- return TRUE;
+ return true;
}
// Hides all sound files (. Wav).
@@ -705,7 +705,7 @@ int CSound::RetPriority(Sound sound) // Seeks a free buffer.
-BOOL CSound::SearchFreeBuffer(Sound sound, int &channel, BOOL &bAlreadyLoaded)
+bool CSound::SearchFreeBuffer(Sound sound, int &channel, bool &bAlreadyLoaded)
{
DWORD status;
int i, priority;
@@ -725,8 +725,8 @@ BOOL CSound::SearchFreeBuffer(Sound sound, int &channel, BOOL &bAlreadyLoaded) m_channel[i].priority = priority;
m_channel[i].uniqueStamp = m_uniqueStamp++;
channel = i;
- bAlreadyLoaded = TRUE;
- return TRUE;
+ bAlreadyLoaded = true;
+ return true;
}
}
#endif
@@ -739,8 +739,8 @@ BOOL CSound::SearchFreeBuffer(Sound sound, int &channel, BOOL &bAlreadyLoaded) m_channel[i].priority = priority;
m_channel[i].uniqueStamp = m_uniqueStamp++;
channel = i;
- bAlreadyLoaded = FALSE;
- return TRUE;
+ bAlreadyLoaded = false;
+ return true;
}
}
@@ -758,8 +758,8 @@ BOOL CSound::SearchFreeBuffer(Sound sound, int &channel, BOOL &bAlreadyLoaded) m_channel[i].uniqueStamp = m_uniqueStamp++;
channel = i;
- bAlreadyLoaded = FALSE;
- return TRUE;
+ bAlreadyLoaded = false;
+ return true;
}
}
@@ -776,8 +776,8 @@ BOOL CSound::SearchFreeBuffer(Sound sound, int &channel, BOOL &bAlreadyLoaded) m_channel[i].uniqueStamp = m_uniqueStamp++;
channel = i;
- bAlreadyLoaded = FALSE;
- return TRUE;
+ bAlreadyLoaded = false;
+ return true;
}
// Seeks a channel used the same or lower priority.
@@ -793,20 +793,20 @@ BOOL CSound::SearchFreeBuffer(Sound sound, int &channel, BOOL &bAlreadyLoaded) m_channel[i].uniqueStamp = m_uniqueStamp++;
channel = i;
- bAlreadyLoaded = FALSE;
- return TRUE;
+ bAlreadyLoaded = false;
+ return true;
}
char s[100];
sprintf(s, "Sound %d forget (priority=%d)\n", sound, priority);
OutputDebugString(s);
- return FALSE;
+ return false;
}
// Reads in data from a wave file.
-BOOL CSound::ReadData(LPDIRECTSOUNDBUFFER lpDSB, Sound sound, DWORD size)
+bool CSound::ReadData(LPDIRECTSOUNDBUFFER lpDSB, Sound sound, DWORD size)
{
LPVOID pData1;
DWORD dwData1Size;
@@ -818,7 +818,7 @@ BOOL CSound::ReadData(LPDIRECTSOUNDBUFFER lpDSB, Sound sound, DWORD size) hr = lpDSB->Lock(0, size, &pData1, &dwData1Size, &pData2, &dwData2Size, DSBLOCK_FROMWRITECURSOR);
if ( hr != DS_OK )
{
- return FALSE;
+ return false;
}
// Read in first chunk of data.
@@ -837,17 +837,17 @@ BOOL CSound::ReadData(LPDIRECTSOUNDBUFFER lpDSB, Sound sound, DWORD size) hr = lpDSB->Unlock(pData1, dwData1Size, pData2, dwData2Size);
if ( hr != DS_OK )
{
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
// Creates a DirectSound buffer.
-BOOL CSound::CreateSoundBuffer(int channel, DWORD size, DWORD freq,
+bool CSound::CreateSoundBuffer(int channel, DWORD size, DWORD freq,
DWORD bitsPerSample, DWORD blkAlign,
- BOOL bStereo)
+ bool bStereo)
{
PCMWAVEFORMAT pcmwf;
DSBUFFERDESC dsbdesc;
@@ -880,7 +880,7 @@ BOOL CSound::CreateSoundBuffer(int channel, DWORD size, DWORD freq, dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf;
hr = m_lpDS->CreateSoundBuffer(&dsbdesc, &m_channel[channel].soundBuffer, NULL);
- if ( hr != DS_OK ) return FALSE;
+ if ( hr != DS_OK ) return false;
if ( m_ctrl3D )
{
@@ -889,45 +889,45 @@ BOOL CSound::CreateSoundBuffer(int channel, DWORD size, DWORD freq, IID_IDirectSound3DBuffer,
(VOID**)&m_channel[channel].soundBuffer3D
);
- if ( hr != DS_OK ) return FALSE;
+ if ( hr != DS_OK ) return false;
}
- m_channel[channel].bUsed = TRUE;
- m_channel[channel].bMute = FALSE;
- return TRUE;
+ m_channel[channel].bUsed = true;
+ m_channel[channel].bMute = false;
+ return true;
}
// Creates a DirectSound buffer from a wave file.
-BOOL CSound::CreateBuffer(int channel, Sound sound)
+bool CSound::CreateBuffer(int channel, Sound sound)
{
WaveHeader* wavHdr;
DWORD size;
- BOOL bStereo;
+ bool bStereo;
- if ( m_files[sound] == 0 ) return FALSE;
+ if ( m_files[sound] == 0 ) return false;
wavHdr = (WaveHeader*)m_files[sound];
size = wavHdr->dwDSize;
- bStereo = wavHdr->wChnls > 1 ? TRUE : FALSE;
+ bStereo = wavHdr->wChnls > 1 ? true : false;
// Create the sound buffer for the wave file.
if ( !CreateSoundBuffer(channel, size, wavHdr->dwSRate,
wavHdr->BitsPerSample, wavHdr->wBlkAlign, bStereo) )
{
- return FALSE;
+ return false;
}
// Read the data for the wave file into the sound buffer.
if ( !ReadData(m_channel[channel].soundBuffer, sound, size) )
{
- return FALSE;
+ return false;
}
m_channel[channel].type = sound;
// Close out the wave file.
- return TRUE;
+ return true;
}
// Calculates the volume and pan of a sound, non-3D mode.
@@ -985,7 +985,7 @@ void CSound::ComputeVolumePan2D(int channel, const D3DVECTOR &pos) // Sounds in the middle.
// Returns the associated channel or -1.
-int CSound::Play(Sound sound, float amplitude, float frequency, BOOL bLoop)
+int CSound::Play(Sound sound, float amplitude, float frequency, bool bLoop)
{
return Play(sound, m_lookat, amplitude, frequency, bLoop);
}
@@ -994,11 +994,11 @@ int CSound::Play(Sound sound, float amplitude, float frequency, BOOL bLoop) // Returns the associated channel or -1.
int CSound::Play(Sound sound, D3DVECTOR pos,
- float amplitude, float frequency, BOOL bLoop)
+ float amplitude, float frequency, bool bLoop)
{
DS3DBUFFER sb;
int channel, iVolume, iPan, iFreq, uniqueStamp;
- BOOL bAlreadyLoaded;
+ bool bAlreadyLoaded;
DWORD flag, freq;
HRESULT err;
@@ -1019,7 +1019,7 @@ int CSound::Play(Sound sound, D3DVECTOR pos, m_channel[channel].soundBuffer->Release();
m_channel[channel].soundBuffer = 0;
}
- m_channel[channel].bUsed = FALSE;
+ m_channel[channel].bUsed = false;
return -1;
}
}
@@ -1044,7 +1044,7 @@ int CSound::Play(Sound sound, D3DVECTOR pos, OutputDebugString(s);
#endif
- m_channel[channel].oper[0].bUsed = FALSE;
+ m_channel[channel].oper[0].bUsed = false;
m_channel[channel].startAmplitude = amplitude;
m_channel[channel].startFrequency = frequency;
m_channel[channel].changeFrequency = 1.0f;
@@ -1120,48 +1120,48 @@ int CSound::Play(Sound sound, D3DVECTOR pos, // Check a channel number.
// Adapts the channel, so it can be used as an offset in m_channel.
-BOOL CSound::CheckChannel(int &channel)
+bool CSound::CheckChannel(int &channel)
{
int uniqueStamp;
uniqueStamp = (channel>>16)&0xffff;
channel &= 0xffff;
- if ( !m_bEnable ) return FALSE;
- if ( !m_bState || m_audioVolume == 0 ) return FALSE;
+ if ( !m_bEnable ) return false;
+ if ( !m_bState || m_audioVolume == 0 ) return false;
- if ( channel < 0 || channel >= m_maxSound ) return FALSE;
- if ( !m_channel[channel].bUsed ) return FALSE;
+ if ( channel < 0 || channel >= m_maxSound ) return false;
+ if ( !m_channel[channel].bUsed ) return false;
- if ( m_channel[channel].uniqueStamp != uniqueStamp ) return FALSE;
+ if ( m_channel[channel].uniqueStamp != uniqueStamp ) return false;
- return TRUE;
+ return true;
}
// Removes all envelopes.
-BOOL CSound::FlushEnvelope(int channel)
+bool CSound::FlushEnvelope(int channel)
{
- if ( !CheckChannel(channel) ) return FALSE;
+ if ( !CheckChannel(channel) ) return false;
- m_channel[channel].oper[0].bUsed = FALSE;
- return TRUE;
+ m_channel[channel].oper[0].bUsed = false;
+ return true;
}
// Adds an operation envelope.
-BOOL CSound::AddEnvelope(int channel, float amplitude, float frequency,
+bool CSound::AddEnvelope(int channel, float amplitude, float frequency,
float time, SoundNext oper)
{
int i;
- if ( !CheckChannel(channel) ) return FALSE;
+ if ( !CheckChannel(channel) ) return false;
for ( i=0 ; i<MAXOPER ; i++ )
{
if ( m_channel[channel].oper[i].bUsed ) continue;
- m_channel[channel].oper[i].bUsed = TRUE;
+ m_channel[channel].oper[i].bUsed = true;
m_channel[channel].oper[i].finalAmplitude = amplitude;
m_channel[channel].oper[i].finalFrequency = frequency;
m_channel[channel].oper[i].totalTime = time;
@@ -1170,22 +1170,22 @@ BOOL CSound::AddEnvelope(int channel, float amplitude, float frequency, if ( i < MAXOPER-1 )
{
- m_channel[channel].oper[i+1].bUsed = FALSE;
+ m_channel[channel].oper[i+1].bUsed = false;
}
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// Changes the position of a sound.
-BOOL CSound::Position(int channel, D3DVECTOR pos)
+bool CSound::Position(int channel, D3DVECTOR pos)
{
float amplitude, pan;
int iVolume, iPan;
HRESULT err;
- if ( !CheckChannel(channel) ) return FALSE;
+ if ( !CheckChannel(channel) ) return false;
m_channel[channel].pos = pos;
@@ -1213,18 +1213,18 @@ BOOL CSound::Position(int channel, D3DVECTOR pos) err = m_channel[channel].soundBuffer->SetPan(iPan);
DisplayError("SetPan", m_channel[channel].type, err);
}
- return TRUE;
+ return true;
}
// Changes the frequency of a sound.
// 0.5 down of an octave and 2.0 up of an octave.
-BOOL CSound::Frequency(int channel, float frequency)
+bool CSound::Frequency(int channel, float frequency)
{
HRESULT err;
int iFreq;
- if ( !CheckChannel(channel) ) return FALSE;
+ if ( !CheckChannel(channel) ) return false;
m_channel[channel].changeFrequency = frequency;
@@ -1235,22 +1235,22 @@ BOOL CSound::Frequency(int channel, float frequency) DisplayError("Frequency", m_channel[channel].type, err);
}
- return TRUE;
+ return true;
}
// Stops sound.
-BOOL CSound::Stop(int channel)
+bool CSound::Stop(int channel)
{
- if ( !CheckChannel(channel) ) return FALSE;
+ if ( !CheckChannel(channel) ) return false;
m_channel[channel].soundBuffer->Stop();
- return TRUE;
+ return true;
}
// Stops all sounds.
-BOOL CSound::StopAll()
+bool CSound::StopAll()
{
DWORD status;
int i;
@@ -1268,14 +1268,14 @@ BOOL CSound::StopAll() m_channel[i].soundBuffer->Release();
m_channel[i].soundBuffer = 0;
- m_channel[i].bUsed = FALSE;
+ m_channel[i].bUsed = false;
}
- return TRUE;
+ return true;
}
// Silent all sounds.
-BOOL CSound::MuteAll(BOOL bMute)
+bool CSound::MuteAll(bool bMute)
{
int i;
@@ -1285,7 +1285,7 @@ BOOL CSound::MuteAll(BOOL bMute) m_channel[i].bMute = bMute;
}
- return TRUE;
+ return true;
}
@@ -1305,7 +1305,7 @@ void CSound::OperNext(int channel) m_channel[channel].oper[i] = m_channel[channel].oper[i+1];
}
- m_channel[channel].oper[i].bUsed = FALSE;
+ m_channel[channel].oper[i].bUsed = false;
}
// Updates the sound buffers.
@@ -1442,7 +1442,7 @@ void CSound::SetListener(D3DVECTOR eye, D3DVECTOR lookat) // Uses MCI to play a MIDI file. The window procedure
// is notified when playback is complete.
-BOOL CSound::PlayMusic(int rank, BOOL bRepeat)
+bool CSound::PlayMusic(int rank, bool bRepeat)
{
MCI_OPEN_PARMS mciOpenParms;
MCI_PLAY_PARMS mciPlayParms;
@@ -1452,14 +1452,14 @@ BOOL CSound::PlayMusic(int rank, BOOL bRepeat) m_bRepeatMusic = bRepeat;
m_playTime = 0.0f;
- if ( m_midiVolume == 0 ) return TRUE;
+ if ( m_midiVolume == 0 ) return true;
if ( m_bAudioTrack )
{
return PlayAudioTrack(rank);
}
- if ( !m_bEnable ) return TRUE;
+ if ( !m_bEnable ) return true;
InitMidiVolume(m_midiVolume);
m_lastMidiVolume = m_midiVolume;
@@ -1478,7 +1478,7 @@ BOOL CSound::PlayMusic(int rank, BOOL bRepeat) {
mciGetErrorString(dwReturn, filename, 128);
// Failed to open device. Don't close it; just return error.
- return FALSE;
+ return false;
}
// The device opened successfully; get the device ID.
@@ -1494,11 +1494,11 @@ BOOL CSound::PlayMusic(int rank, BOOL bRepeat) {
mciGetErrorString(dwReturn, filename, 128);
StopMusic();
- return FALSE;
+ return false;
}
m_MIDIMusic = rank;
- return TRUE;
+ return true;
}
// Uses MCI to play a CD-audio track. The window procedure
@@ -1506,7 +1506,7 @@ BOOL CSound::PlayMusic(int rank, BOOL bRepeat) // The rank parameter is in space [1..n] !
// For CD mix (data/audio), it will be [2..n] !
-BOOL CSound::PlayAudioTrack(int rank)
+bool CSound::PlayAudioTrack(int rank)
{
#if _SOUNDTRACKS
MCI_OPEN_PARMS mciOpenParms;
@@ -1516,8 +1516,8 @@ BOOL CSound::PlayAudioTrack(int rank) char filename[MAX_PATH];
char device[10];
- if ( !m_bEnable ) return TRUE;
-//? if ( m_midiVolume == 0 ) return TRUE;
+ if ( !m_bEnable ) return true;
+//? if ( m_midiVolume == 0 ) return true;
InitAudioTrackVolume(m_midiVolume);
m_lastMidiVolume = m_midiVolume;
@@ -1552,7 +1552,7 @@ BOOL CSound::PlayAudioTrack(int rank) {
mciGetErrorString(dwReturn, filename, 128);
// Failed to open device. Don't close it; just return error.
- return FALSE;
+ return false;
}
// The device opened successfully; get the device ID.
@@ -1569,7 +1569,7 @@ BOOL CSound::PlayAudioTrack(int rank) {
mciGetErrorString(dwReturn, filename, 128);
StopMusic();
- return FALSE;
+ return false;
}
// Begin playback.
@@ -1585,27 +1585,27 @@ BOOL CSound::PlayAudioTrack(int rank) {
mciGetErrorString(dwReturn, filename, 128);
StopMusic();
- return FALSE;
+ return false;
}
m_MIDIMusic = rank;
#endif
- return TRUE;
+ return true;
}
// Restart the MIDI player.
-BOOL CSound::RestartMusic()
+bool CSound::RestartMusic()
{
- if ( !m_bRepeatMusic ) return FALSE;
+ if ( !m_bRepeatMusic ) return false;
OutputDebugString("RestartMusic\n");
- if ( !m_bEnable ) return TRUE;
-//? if ( m_midiVolume == 0 ) return TRUE;
- if ( m_MIDIMusic == 0 ) return FALSE;
- if ( m_playTime < 5.0f ) return FALSE;
+ if ( !m_bEnable ) return true;
+//? if ( m_midiVolume == 0 ) return true;
+ if ( m_MIDIMusic == 0 ) return false;
+ if ( m_playTime < 5.0f ) return false;
- return PlayMusic(m_MIDIMusic, TRUE);
+ return PlayMusic(m_MIDIMusic, true);
}
// Shuts down the MIDI player.
@@ -1631,9 +1631,9 @@ void CSound::StopMusic() m_MIDIMusic = 0;
}
-// Returns TRUE if the music is in progress.
+// Returns true if the music is in progress.
-BOOL CSound::IsPlayingMusic()
+bool CSound::IsPlayingMusic()
{
return (m_MIDIMusic != 0);
}
diff --git a/src/sound/sound.h b/src/sound/sound.h index f026b76..ce1c79e 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -162,19 +162,19 @@ public: CSound(CInstanceManager* iMan);
~CSound();
- void SetDebugMode(BOOL bMode);
- BOOL Create(HWND hWnd, BOOL b3D);
+ void SetDebugMode(bool bMode);
+ bool Create(HWND hWnd, bool b3D);
void CacheAll();
- void SetState(BOOL bState);
- BOOL RetEnable();
+ void SetState(bool bState);
+ bool RetEnable();
void SetCDpath(char *path);
- void SetAudioTrack(BOOL bAudio);
+ void SetAudioTrack(bool bAudio);
- void SetSound3D(BOOL bMode);
- BOOL RetSound3D();
- BOOL RetSound3DCap();
+ void SetSound3D(bool bMode);
+ bool RetSound3D();
+ bool RetSound3DCap();
void SetAudioVolume(int volume);
int RetAudioVolume();
@@ -184,51 +184,51 @@ public: void SetListener(D3DVECTOR eye, D3DVECTOR lookat);
void FrameMove(float rTime);
- int Play(Sound sound, float amplitude=1.0f, float frequency=1.0f, BOOL bLoop=FALSE);
- int Play(Sound sound, D3DVECTOR pos, float amplitude=1.0f, float frequency=1.0f, BOOL bLoop=FALSE);
- BOOL FlushEnvelope(int channel);
- BOOL AddEnvelope(int channel, float amplitude, float frequency, float time, SoundNext oper);
- BOOL Position(int channel, D3DVECTOR pos);
- BOOL Frequency(int channel, float frequency);
- BOOL Stop(int channel);
- BOOL StopAll();
- BOOL MuteAll(BOOL bMute);
-
- BOOL PlayMusic(int rank, BOOL bRepeat);
- BOOL RestartMusic();
+ int Play(Sound sound, float amplitude=1.0f, float frequency=1.0f, bool bLoop=false);
+ int Play(Sound sound, D3DVECTOR pos, float amplitude=1.0f, float frequency=1.0f, bool bLoop=false);
+ bool FlushEnvelope(int channel);
+ bool AddEnvelope(int channel, float amplitude, float frequency, float time, SoundNext oper);
+ bool Position(int channel, D3DVECTOR pos);
+ bool Frequency(int channel, float frequency);
+ bool Stop(int channel);
+ bool StopAll();
+ bool MuteAll(bool bMute);
+
+ bool PlayMusic(int rank, bool bRepeat);
+ bool RestartMusic();
void SuspendMusic();
void StopMusic();
- BOOL IsPlayingMusic();
+ bool IsPlayingMusic();
void AdaptVolumeMusic();
protected:
- BOOL CheckChannel(int &channel);
- BOOL CreateSoundBuffer(int channel, DWORD size, DWORD freq, DWORD bitsPerSample, DWORD blkAlign, BOOL bStereo);
- BOOL ReadData(LPDIRECTSOUNDBUFFER lpDSB, Sound sound, DWORD size);
- BOOL CreateBuffer(int channel, Sound sound);
+ bool CheckChannel(int &channel);
+ bool CreateSoundBuffer(int channel, DWORD size, DWORD freq, DWORD bitsPerSample, DWORD blkAlign, bool bStereo);
+ bool ReadData(LPDIRECTSOUNDBUFFER lpDSB, Sound sound, DWORD size);
+ bool CreateBuffer(int channel, Sound sound);
void ComputeVolumePan2D(int channel, const D3DVECTOR &pos);
- BOOL ReadFile(Sound sound, char *metaname, char *filename);
+ bool ReadFile(Sound sound, char *metaname, char *filename);
int RetPriority(Sound sound);
- BOOL SearchFreeBuffer(Sound sound, int &channel, BOOL &bAlreadyLoaded);
+ bool SearchFreeBuffer(Sound sound, int &channel, bool &bAlreadyLoaded);
void OperNext(int channel);
- BOOL PlayAudioTrack(int rank);
+ bool PlayAudioTrack(int rank);
protected:
CInstanceManager* m_iMan;
HWND m_hWnd;
- BOOL m_bEnable;
- BOOL m_bState;
- BOOL m_bAudioTrack;
- BOOL m_ctrl3D;
- BOOL m_bDebugMode;
+ bool m_bEnable;
+ bool m_bState;
+ bool m_bAudioTrack;
+ bool m_ctrl3D;
+ bool m_bDebugMode;
LPDIRECTSOUND m_lpDS;
LPDIRECTSOUND3DLISTENER m_listener;
SoundChannel m_channel[MAXSOUND];
char* m_files[MAXFILES];
UINT m_MidiDeviceID;
int m_MIDIMusic;
- BOOL m_bRepeatMusic;
+ bool m_bRepeatMusic;
int m_audioVolume;
int m_midiVolume;
int m_lastMidiVolume;
diff --git a/src/ui/button.cpp b/src/ui/button.cpp index e03331a..697122c 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -42,9 +42,9 @@ CButton::CButton(CInstanceManager* iMan) : CControl(iMan)
{
- m_bCapture = FALSE;
- m_bImmediat = FALSE;
- m_bRepeat = FALSE;
+ m_bCapture = false;
+ m_bImmediat = false;
+ m_bRepeat = false;
m_repeat = 0.0f;
}
@@ -57,7 +57,7 @@ CButton::~CButton() // Creates a new button.
-BOOL CButton::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CButton::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
@@ -74,16 +74,16 @@ BOOL CButton::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) SetName(name);
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CButton::EventProcess(const Event &event)
+bool CButton::EventProcess(const Event &event)
{
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
+ if ( m_state & STATE_DEAD ) return true;
CControl::EventProcess(event);
@@ -99,7 +99,7 @@ BOOL CButton::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
}
@@ -110,7 +110,7 @@ BOOL CButton::EventProcess(const Event &event) {
if ( CControl::Detect(event.pos) )
{
- m_bCapture = TRUE;
+ m_bCapture = true;
m_repeat = DELAY1;
if ( m_bImmediat || m_bRepeat )
@@ -119,7 +119,7 @@ BOOL CButton::EventProcess(const Event &event) newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
}
- return FALSE;
+ return false;
}
}
@@ -139,11 +139,11 @@ BOOL CButton::EventProcess(const Event &event) }
}
- m_bCapture = FALSE;
+ m_bCapture = false;
m_repeat = 0.0f;
}
- return TRUE;
+ return true;
}
@@ -222,12 +222,12 @@ void CButton::Draw() // Management of immediate mode, which sends the event "press"
// before the mouse button is released.
-void CButton::SetImmediat(BOOL bImmediat)
+void CButton::SetImmediat(bool bImmediat)
{
m_bImmediat = bImmediat;
}
-BOOL CButton::RetImmediat()
+bool CButton::RetImmediat()
{
return m_bImmediat;
}
@@ -236,12 +236,12 @@ BOOL CButton::RetImmediat() // Mode management "autorepeat", when the button
// mouse is held down.
-void CButton::SetRepeat(BOOL bRepeat)
+void CButton::SetRepeat(bool bRepeat)
{
m_bRepeat = bRepeat;
}
-BOOL CButton::RetRepeat()
+bool CButton::RetRepeat()
{
return m_bRepeat;
}
diff --git a/src/ui/button.h b/src/ui/button.h index 9056ae2..cc34997 100644 --- a/src/ui/button.h +++ b/src/ui/button.h @@ -32,24 +32,24 @@ public: CButton(CInstanceManager* iMan);
virtual ~CButton();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
- void SetImmediat(BOOL bRepeat);
- BOOL RetImmediat();
+ void SetImmediat(bool bRepeat);
+ bool RetImmediat();
- void SetRepeat(BOOL bRepeat);
- BOOL RetRepeat();
+ void SetRepeat(bool bRepeat);
+ bool RetRepeat();
protected:
protected:
- BOOL m_bCapture;
- BOOL m_bImmediat;
- BOOL m_bRepeat;
+ bool m_bCapture;
+ bool m_bImmediat;
+ bool m_bRepeat;
float m_repeat;
};
diff --git a/src/ui/check.cpp b/src/ui/check.cpp index f005790..b4b944e 100644 --- a/src/ui/check.cpp +++ b/src/ui/check.cpp @@ -49,7 +49,7 @@ CCheck::~CCheck() // Creates a new button.
-BOOL CCheck::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CCheck::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
char name[100];
char* p;
@@ -63,15 +63,15 @@ BOOL CCheck::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) if ( p != 0 ) *p = 0;
SetName(name);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CCheck::EventProcess(const Event &event)
+bool CCheck::EventProcess(const Event &event)
{
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( m_state & STATE_DEAD ) return true;
CControl::EventProcess(event);
@@ -84,11 +84,11 @@ BOOL CCheck::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
diff --git a/src/ui/check.h b/src/ui/check.h index c0f11cf..8bb2c9c 100644 --- a/src/ui/check.h +++ b/src/ui/check.h @@ -32,9 +32,9 @@ public: CCheck(CInstanceManager* iMan);
virtual ~CCheck();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
diff --git a/src/ui/color.cpp b/src/ui/color.cpp index c4e5694..8876d27 100644 --- a/src/ui/color.cpp +++ b/src/ui/color.cpp @@ -42,7 +42,7 @@ CColor::CColor(CInstanceManager* iMan) : CControl(iMan)
{
- m_bRepeat = FALSE;
+ m_bRepeat = false;
m_repeat = 0.0f;
m_color.r = 0.0f;
@@ -60,7 +60,7 @@ CColor::~CColor() // Creates a new button.
-BOOL CColor::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CColor::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
@@ -77,15 +77,15 @@ BOOL CColor::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) SetName(name);
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CColor::EventProcess(const Event &event)
+bool CColor::EventProcess(const Event &event)
{
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( m_state & STATE_DEAD ) return true;
CControl::EventProcess(event);
@@ -101,7 +101,7 @@ BOOL CColor::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
}
@@ -117,7 +117,7 @@ BOOL CColor::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
@@ -126,7 +126,7 @@ BOOL CColor::EventProcess(const Event &event) m_repeat = 0.0f;
}
- return TRUE;
+ return true;
}
@@ -202,12 +202,12 @@ void CColor::Draw() }
-void CColor::SetRepeat(BOOL bRepeat)
+void CColor::SetRepeat(bool bRepeat)
{
m_bRepeat = bRepeat;
}
-BOOL CColor::RetRepeat()
+bool CColor::RetRepeat()
{
return m_bRepeat;
}
diff --git a/src/ui/color.h b/src/ui/color.h index 6c4d7ad..86d9434 100644 --- a/src/ui/color.h +++ b/src/ui/color.h @@ -33,14 +33,14 @@ public: CColor(CInstanceManager* iMan);
virtual ~CColor();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
- void SetRepeat(BOOL bRepeat);
- BOOL RetRepeat();
+ void SetRepeat(bool bRepeat);
+ bool RetRepeat();
void SetColor(D3DCOLORVALUE color);
D3DCOLORVALUE RetColor();
@@ -48,7 +48,7 @@ public: protected:
protected:
- BOOL m_bRepeat;
+ bool m_bRepeat;
float m_repeat;
D3DCOLORVALUE m_color;
};
diff --git a/src/ui/compass.cpp b/src/ui/compass.cpp index c2733eb..d856e19 100644 --- a/src/ui/compass.cpp +++ b/src/ui/compass.cpp @@ -48,18 +48,18 @@ CCompass::~CCompass() // Creates a new button.
-BOOL CCompass::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CCompass::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CCompass::EventProcess(const Event &event)
+bool CCompass::EventProcess(const Event &event)
{
CControl::EventProcess(event);
@@ -70,11 +70,11 @@ BOOL CCompass::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
diff --git a/src/ui/compass.h b/src/ui/compass.h index cc17c36..113623b 100644 --- a/src/ui/compass.h +++ b/src/ui/compass.h @@ -32,9 +32,9 @@ public: CCompass(CInstanceManager* iMan);
virtual ~CCompass();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 3fa7f79..63ac8ca 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -58,10 +58,10 @@ CControl::CControl(CInstanceManager* iMan) m_justif = 0;
m_name[0] = 0;
m_tooltip[0] = 0;
- m_bFocus = FALSE;
- m_bCapture = FALSE;
+ m_bFocus = false;
+ m_bCapture = false;
- m_bGlint = FALSE;
+ m_bGlint = false;
m_glintCorner1 = FPOINT(0.0f, 0.0f);
m_glintCorner2 = FPOINT(0.0f, 0.0f);
m_glintProgress = 999.0f;
@@ -78,7 +78,7 @@ CControl::~CControl() // Creates a new button.
// pos: [0..1]
-BOOL CControl::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CControl::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
char text[100];
char* p;
@@ -108,7 +108,7 @@ BOOL CControl::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) strcpy(m_tooltip, p+1); // text after "\\"
}
- return TRUE;
+ return true;
}
@@ -145,34 +145,34 @@ FPOINT CControl::RetDim() // Modify an attribute of state.
-BOOL CControl::SetState(int state, BOOL bState)
+bool CControl::SetState(int state, bool bState)
{
if ( bState ) m_state |= state;
else m_state &= ~state;
- return TRUE;
+ return true;
}
// Sets an attribute of state.
-BOOL CControl::SetState(int state)
+bool CControl::SetState(int state)
{
m_state |= state;
- return TRUE;
+ return true;
}
// Removes an attribute of state.
-BOOL CControl::ClearState(int state)
+bool CControl::ClearState(int state)
{
m_state &= ~state;
- return TRUE;
+ return true;
}
// Tests an attribute of state.
-BOOL CControl::TestState(int state)
+bool CControl::TestState(int state)
{
- return (m_state & state) ? TRUE:FALSE;
+ return (m_state & state) ? true:false;
}
// Returns all attributes of state.
@@ -198,7 +198,7 @@ int CControl::RetIcon() // Management of the button name.
-void CControl::SetName(char* name, BOOL bTooltip)
+void CControl::SetName(char* name, bool bTooltip)
{
char* p;
@@ -292,33 +292,33 @@ FontType CControl::RetFontType() // Specifies the tooltip.
-BOOL CControl::SetTooltip(char* name)
+bool CControl::SetTooltip(char* name)
{
strcpy(m_tooltip, name);
- return TRUE;
+ return true;
}
-BOOL CControl::GetTooltip(FPOINT pos, char* name)
+bool CControl::GetTooltip(FPOINT pos, char* name)
{
- if ( m_tooltip[0] == 0 ) return FALSE;
- if ( (m_state & STATE_VISIBLE) == 0 ) return FALSE;
- if ( (m_state & STATE_ENABLE) == 0 ) return FALSE;
- if ( m_state & STATE_DEAD ) return FALSE;
- if ( !Detect(pos) ) return FALSE;
+ if ( m_tooltip[0] == 0 ) return false;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return false;
+ if ( (m_state & STATE_ENABLE) == 0 ) return false;
+ if ( m_state & STATE_DEAD ) return false;
+ if ( !Detect(pos) ) return false;
strcpy(name, m_tooltip);
- return TRUE;
+ return true;
}
// Management of the focus.
-void CControl::SetFocus(BOOL bFocus)
+void CControl::SetFocus(bool bFocus)
{
m_bFocus = bFocus;
}
-BOOL CControl::RetFocus()
+bool CControl::RetFocus()
{
return m_bFocus;
}
@@ -334,9 +334,9 @@ EventMsg CControl::RetEventMsg() // Management of an event.
-BOOL CControl::EventProcess(const Event &event)
+bool CControl::EventProcess(const Event &event)
{
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( m_state & STATE_DEAD ) return true;
if ( event.event == EVENT_FRAME && m_bGlint )
{
@@ -366,7 +366,7 @@ BOOL CControl::EventProcess(const Event &event) {
if ( Detect(event.pos) )
{
- m_bCapture = TRUE;
+ m_bCapture = true;
SetState(STATE_PRESS);
}
}
@@ -385,11 +385,11 @@ BOOL CControl::EventProcess(const Event &event) if ( event.event == EVENT_LBUTTONUP && m_bCapture )
{
- m_bCapture = FALSE;
+ m_bCapture = false;
ClearState(STATE_PRESS);
}
- return TRUE;
+ return true;
}
@@ -397,12 +397,12 @@ BOOL CControl::EventProcess(const Event &event) void CControl::GlintDelete()
{
- m_bGlint = FALSE;
+ m_bGlint = false;
}
// Creates a reflection for that button.
-void CControl::GlintCreate(FPOINT ref, BOOL bLeft, BOOL bUp)
+void CControl::GlintCreate(FPOINT ref, bool bLeft, bool bUp)
{
float offset;
@@ -434,7 +434,7 @@ void CControl::GlintCreate(FPOINT ref, BOOL bLeft, BOOL bUp) m_glintCorner2.y = ref.y+offset;
}
- m_bGlint = TRUE;
+ m_bGlint = true;
}
// Management of reflection.
@@ -865,7 +865,7 @@ void CControl::DrawShadow(FPOINT pos, FPOINT dim, float deep) // Detects whether a position is in the button.
-BOOL CControl::Detect(FPOINT pos)
+bool CControl::Detect(FPOINT pos)
{
return ( pos.x >= m_pos.x &&
pos.x <= m_pos.x+m_dim.x &&
diff --git a/src/ui/control.h b/src/ui/control.h index 9e0fceb..f36e7ba 100644 --- a/src/ui/control.h +++ b/src/ui/control.h @@ -58,22 +58,22 @@ public: CControl(CInstanceManager* iMan);
virtual ~CControl();
- virtual BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ virtual bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- virtual BOOL EventProcess(const Event &event);
+ virtual bool EventProcess(const Event &event);
virtual void SetPos(FPOINT pos);
virtual FPOINT RetPos();
virtual void SetDim(FPOINT dim);
virtual FPOINT RetDim();
- virtual BOOL SetState(int state, BOOL bState);
- virtual BOOL SetState(int state);
- virtual BOOL ClearState(int state);
- virtual BOOL TestState(int state);
+ virtual bool SetState(int state, bool bState);
+ virtual bool SetState(int state);
+ virtual bool ClearState(int state);
+ virtual bool TestState(int state);
virtual int RetState();
virtual void SetIcon(int icon);
virtual int RetIcon();
- virtual void SetName(char* name, BOOL bTooltip=TRUE);
+ virtual void SetName(char* name, bool bTooltip=true);
virtual char* RetName();
virtual void SetJustif(int mode);
virtual int RetJustif();
@@ -83,10 +83,10 @@ public: virtual float RetFontStretch();
virtual void SetFontType(FontType font);
virtual FontType RetFontType();
- virtual BOOL SetTooltip(char* name);
- virtual BOOL GetTooltip(FPOINT pos, char* name);
- virtual void SetFocus(BOOL bFocus);
- virtual BOOL RetFocus();
+ virtual bool SetTooltip(char* name);
+ virtual bool GetTooltip(FPOINT pos, char* name);
+ virtual void SetFocus(bool bFocus);
+ virtual bool RetFocus();
virtual EventMsg RetEventMsg();
@@ -94,14 +94,14 @@ public: protected:
void GlintDelete();
- void GlintCreate(FPOINT ref, BOOL bLeft=TRUE, BOOL bUp=TRUE);
+ void GlintCreate(FPOINT ref, bool bLeft=true, bool bUp=true);
void GlintFrame(const Event &event);
void DrawPart(int icon, float zoom, float ex);
void DrawIcon(FPOINT pos, FPOINT dim, FPOINT uv1, FPOINT uv2, float ex=0.0f);
void DrawIcon(FPOINT pos, FPOINT dim, FPOINT uv1, FPOINT uv2, FPOINT corner, float ex);
void DrawWarning(FPOINT pos, FPOINT dim);
void DrawShadow(FPOINT pos, FPOINT dim, float deep=1.0f);
- virtual BOOL Detect(FPOINT pos);
+ virtual bool Detect(FPOINT pos);
protected:
CInstanceManager* m_iMan;
@@ -122,10 +122,10 @@ protected: int m_justif; // type of justification (-1,0,1)
char m_name[100]; // name of the button
char m_tooltip[100]; // name of tooltip
- BOOL m_bFocus;
- BOOL m_bCapture;
+ bool m_bFocus;
+ bool m_bCapture;
- BOOL m_bGlint;
+ bool m_bGlint;
FPOINT m_glintCorner1;
FPOINT m_glintCorner2;
float m_glintProgress;
diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index 534a2ac..b30aeb1 100644 --- a/src/ui/displayinfo.cpp +++ b/src/ui/displayinfo.cpp @@ -67,8 +67,8 @@ CDisplayInfo::CDisplayInfo(CInstanceManager* iMan) m_particule = (CParticule*)m_iMan->SearchInstance(CLASS_PARTICULE);
m_light = (CLight*)m_iMan->SearchInstance(CLASS_LIGHT);
- m_bInfoMaximized = TRUE;
- m_bInfoMinimized = FALSE;
+ m_bInfoMaximized = true;
+ m_bInfoMinimized = false;
m_infoFinalPos = m_infoActualPos = m_infoNormalPos = FPOINT(0.00f, 0.00f);
m_infoFinalDim = m_infoActualPos = m_infoNormalDim = FPOINT(1.00f, 1.00f);
@@ -87,7 +87,7 @@ CDisplayInfo::~CDisplayInfo() // Management of an event.
-BOOL CDisplayInfo::EventProcess(const Event &event)
+bool CDisplayInfo::EventProcess(const Event &event)
{
CWindow* pw;
CEdit* edit;
@@ -191,7 +191,7 @@ BOOL CDisplayInfo::EventProcess(const Event &event) if ( event.event == EVENT_STUDIO_SIZE ) // size?
{
slider = (CSlider*)pw->SearchControl(EVENT_STUDIO_SIZE);
- if ( slider == 0 ) return FALSE;
+ if ( slider == 0 ) return false;
m_main->SetFontSize(9.0f+slider->RetVisibleValue()*6.0f);
ViewDisplayInfo();
}
@@ -223,8 +223,8 @@ BOOL CDisplayInfo::EventProcess(const Event &event) {
m_infoFinalPos = m_infoNormalPos;
m_infoFinalDim = m_infoNormalDim;
- m_bInfoMinimized = FALSE;
- m_bInfoMaximized = FALSE;
+ m_bInfoMinimized = false;
+ m_bInfoMaximized = false;
}
else
{
@@ -232,8 +232,8 @@ BOOL CDisplayInfo::EventProcess(const Event &event) m_infoFinalPos.y = -0.34f;
m_infoFinalDim.x = 1.00f;
m_infoFinalDim.y = 0.40f;
- m_bInfoMinimized = TRUE;
- m_bInfoMaximized = FALSE;
+ m_bInfoMinimized = true;
+ m_bInfoMaximized = false;
}
//? m_main->SetEditFull(m_bInfoMaximized);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW4);
@@ -249,8 +249,8 @@ BOOL CDisplayInfo::EventProcess(const Event &event) {
m_infoFinalPos = m_infoNormalPos;
m_infoFinalDim = m_infoNormalDim;
- m_bInfoMinimized = FALSE;
- m_bInfoMaximized = FALSE;
+ m_bInfoMinimized = false;
+ m_bInfoMaximized = false;
}
else
{
@@ -258,8 +258,8 @@ BOOL CDisplayInfo::EventProcess(const Event &event) m_infoFinalPos.y = 0.00f;
m_infoFinalDim.x = 1.00f;
m_infoFinalDim.y = 1.00f;
- m_bInfoMinimized = FALSE;
- m_bInfoMaximized = TRUE;
+ m_bInfoMinimized = false;
+ m_bInfoMaximized = true;
}
//? m_main->SetEditFull(m_bInfoMaximized);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW4);
@@ -270,13 +270,13 @@ BOOL CDisplayInfo::EventProcess(const Event &event) }
}
}
- return TRUE;
+ return true;
}
// The brain is changing by time.
-BOOL CDisplayInfo::EventFrame(const Event &event)
+bool CDisplayInfo::EventFrame(const Event &event)
{
float time;
@@ -293,7 +293,7 @@ BOOL CDisplayInfo::EventFrame(const Event &event) AdjustDisplayInfo(m_infoActualPos, m_infoActualDim);
}
- return TRUE;
+ return true;
}
@@ -304,7 +304,7 @@ void CDisplayInfo::HyperUpdate() CWindow* pw;
CEdit* edit;
CButton* button;
- BOOL bEnable;
+ bool bEnable;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW4);
if ( pw == 0 ) return;
@@ -336,7 +336,7 @@ void CDisplayInfo::HyperUpdate() // Beginning of the display of information.
-void CDisplayInfo::StartDisplayInfo(char *filename, int index, BOOL bSoluce)
+void CDisplayInfo::StartDisplayInfo(char *filename, int index, bool bSoluce)
{
D3DLIGHT7 light;
FPOINT pos, dim;
@@ -361,10 +361,10 @@ void CDisplayInfo::StartDisplayInfo(char *filename, int index, BOOL bSoluce) }
}
- m_main->SetEditLock(TRUE, FALSE);
- m_main->SetEditFull(FALSE);
+ m_main->SetEditLock(true, false);
+ m_main->SetEditFull(false);
m_bInitPause = m_engine->RetPause();
- m_engine->SetPause(TRUE);
+ m_engine->SetPause(true);
m_infoCamera = m_camera->RetType();
m_camera->SetType(CAMERA_INFO);
@@ -372,7 +372,7 @@ void CDisplayInfo::StartDisplayInfo(char *filename, int index, BOOL bSoluce) dim = m_infoActualDim = m_infoFinalDim;
pw = m_interface->CreateWindows(pos, dim, 4, EVENT_WINDOW4);
if ( pw == 0 ) return;
-//? pw->SetClosable(TRUE);
+//? pw->SetClosable(true);
//? GetResource(RES_TEXT, RT_DISINFO_TITLE, res);
//? pw->SetName(res);
//? pw->SetMinDim(FPOINT(0.56f, 0.40f));
@@ -383,15 +383,15 @@ void CDisplayInfo::StartDisplayInfo(char *filename, int index, BOOL bSoluce) edit = pw->CreateEdit(pos, dim, 0, EVENT_EDIT1);
if ( edit == 0 ) return;
edit->SetState(STATE_SHADOW);
- edit->SetMultiFont(TRUE);
+ edit->SetMultiFont(true);
edit->SetMaxChar(10000);
edit->SetFontType(FONT_COLOBOT);
edit->SetSoluceMode(bSoluce);
edit->ReadText(filename);
edit->HyperHome(filename);
- edit->SetEditCap(FALSE); // just to see!
- edit->SetHiliteCap(FALSE);
- edit->SetFocus(TRUE);
+ edit->SetEditCap(false); // just to see!
+ edit->SetHiliteCap(false);
+ edit->SetFocus(true);
ViewDisplayInfo();
@@ -447,14 +447,14 @@ void CDisplayInfo::StartDisplayInfo(char *filename, int index, BOOL bSoluce) AdjustDisplayInfo(m_infoActualPos, m_infoActualDim);
UpdateIndexButton();
- m_engine->SetDrawWorld(FALSE); // doesn't draw anything in the interface
- m_engine->SetDrawFront(TRUE); // toto draws on the interface
- m_particule->SetFrameUpdate(SH_WORLD, FALSE); // particles break into world
+ m_engine->SetDrawWorld(false); // doesn't draw anything in the interface
+ m_engine->SetDrawFront(true); // toto draws on the interface
+ m_particule->SetFrameUpdate(SH_WORLD, false); // particles break into world
m_toto = SearchToto();
if ( m_toto != 0 )
{
- m_toto->SetDrawFront(TRUE);
+ m_toto->SetDrawFront(true);
toto = (CMotionToto*)m_toto->RetMotion();
if ( toto != 0 )
@@ -795,7 +795,7 @@ void CDisplayInfo::UpdateIndexButton() if ( edit != 0 )
{
//? edit->SetHiliteCap(m_index==SATCOM_LOADING);
- edit->SetHiliteCap(TRUE);
+ edit->SetHiliteCap(true);
}
UpdateCopyButton();
@@ -848,14 +848,14 @@ void CDisplayInfo::StopDisplayInfo() }
else
{
- if ( !m_bInitPause ) m_engine->SetPause(FALSE);
- m_main->SetEditLock(FALSE, FALSE);
+ if ( !m_bInitPause ) m_engine->SetPause(false);
+ m_main->SetEditLock(false, false);
}
m_camera->SetType(m_infoCamera);
- m_engine->SetDrawWorld(TRUE); // draws all on the interface
- m_engine->SetDrawFront(FALSE); // draws nothing on the interface
- m_particule->SetFrameUpdate(SH_WORLD, TRUE);
+ m_engine->SetDrawWorld(true); // draws all on the interface
+ m_engine->SetDrawFront(false); // draws nothing on the interface
+ m_particule->SetFrameUpdate(SH_WORLD, true);
m_particule->FlushParticule(SH_FRONT);
m_particule->FlushParticule(SH_INTERFACE);
@@ -1017,13 +1017,13 @@ void CDisplayInfo::CreateObjectsFile() ObjectList list[200];
char line[100];
int i;
- BOOL bRadar, bAtLeast;
+ bool bRadar, bAtLeast;
file = fopen("help\\objects.txt", "w");
if ( file == 0 ) return;
list[0].total = 0; // empty list
- bRadar = FALSE;
+ bRadar = false;
for ( i=0 ; i<1000000 ; i++ )
{
pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i);
@@ -1039,14 +1039,14 @@ void CDisplayInfo::CreateObjectsFile() ObjectAdd(list, type);
- if ( type == OBJECT_RADAR ) bRadar = TRUE;
+ if ( type == OBJECT_RADAR ) bRadar = true;
}
if ( bRadar )
{
GetResource(RES_TEXT, RT_SATCOM_LIST, line);
fputs(line, file);
- bAtLeast = FALSE;
+ bAtLeast = false;
for ( i=0 ; i<200 ; i++ )
{
if ( list[i].total == 0 ) break; // end of the list?
@@ -1055,7 +1055,7 @@ void CDisplayInfo::CreateObjectsFile() list[i].type == OBJECT_HUMAN )
{
ObjectWrite(file, list, i);
- bAtLeast = TRUE;
+ bAtLeast = true;
}
}
if ( !bAtLeast )
@@ -1068,7 +1068,7 @@ void CDisplayInfo::CreateObjectsFile() fputs(line, file);
GetResource(RES_TEXT, RT_SATCOM_BOT, line);
fputs(line, file);
- bAtLeast = FALSE;
+ bAtLeast = false;
for ( i=0 ; i<200 ; i++ )
{
if ( list[i].total == 0 ) break; // end of the list?
@@ -1102,7 +1102,7 @@ void CDisplayInfo::CreateObjectsFile() list[i].type == OBJECT_MOBILEdr )
{
ObjectWrite(file, list, i);
- bAtLeast = TRUE;
+ bAtLeast = true;
}
}
if ( !bAtLeast )
@@ -1115,7 +1115,7 @@ void CDisplayInfo::CreateObjectsFile() fputs(line, file);
GetResource(RES_TEXT, RT_SATCOM_BUILDING, line);
fputs(line, file);
- bAtLeast = FALSE;
+ bAtLeast = false;
for ( i=0 ; i<200 ; i++ )
{
if ( list[i].total == 0 ) break; // end of the list?
@@ -1143,7 +1143,7 @@ void CDisplayInfo::CreateObjectsFile() list[i].type == OBJECT_HUSTON )
{
ObjectWrite(file, list, i);
- bAtLeast = TRUE;
+ bAtLeast = true;
}
}
if ( !bAtLeast )
@@ -1156,7 +1156,7 @@ void CDisplayInfo::CreateObjectsFile() fputs(line, file);
GetResource(RES_TEXT, RT_SATCOM_FRET, line);
fputs(line, file);
- bAtLeast = FALSE;
+ bAtLeast = false;
for ( i=0 ; i<200 ; i++ )
{
if ( list[i].total == 0 ) break; // end of the list?
@@ -1171,7 +1171,7 @@ void CDisplayInfo::CreateObjectsFile() list[i].type == OBJECT_TNT )
{
ObjectWrite(file, list, i);
- bAtLeast = TRUE;
+ bAtLeast = true;
}
}
if ( !bAtLeast )
@@ -1184,7 +1184,7 @@ void CDisplayInfo::CreateObjectsFile() fputs(line, file);
GetResource(RES_TEXT, RT_SATCOM_ALIEN, line);
fputs(line, file);
- bAtLeast = FALSE;
+ bAtLeast = false;
for ( i=0 ; i<200 ; i++ )
{
if ( list[i].total == 0 ) break; // end of the list?
@@ -1196,7 +1196,7 @@ void CDisplayInfo::CreateObjectsFile() list[i].type == OBJECT_SPIDER )
{
ObjectWrite(file, list, i);
- bAtLeast = TRUE;
+ bAtLeast = true;
}
}
if ( !bAtLeast )
diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h index bbe6a72..2a40535 100644 --- a/src/ui/displayinfo.h +++ b/src/ui/displayinfo.h @@ -40,16 +40,16 @@ public: CDisplayInfo(CInstanceManager* iMan);
~CDisplayInfo();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
- void StartDisplayInfo(char *filename, int index, BOOL bSoluce);
+ void StartDisplayInfo(char *filename, int index, bool bSoluce);
void StopDisplayInfo();
void SetPosition(int pos);
int RetPosition();
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
void HyperUpdate();
void AdjustDisplayInfo(FPOINT wpos, FPOINT wdim);
void ChangeIndexButton(int index);
@@ -69,8 +69,8 @@ protected: CParticule* m_particule;
CLight* m_light;
- BOOL m_bInfoMaximized;
- BOOL m_bInfoMinimized;
+ bool m_bInfoMaximized;
+ bool m_bInfoMinimized;
int m_index;
CameraType m_infoCamera;
@@ -81,9 +81,9 @@ protected: FPOINT m_infoFinalPos;
FPOINT m_infoFinalDim;
int m_lightSuppl;
- BOOL m_bEditLock;
- BOOL m_bInitPause;
- BOOL m_bSoluce;
+ bool m_bEditLock;
+ bool m_bInitPause;
+ bool m_bSoluce;
CObject* m_toto;
};
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index f4c16f4..eb5cbeb 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -62,15 +62,15 @@ CDisplayText::CDisplayText(CInstanceManager* iMan) for ( i=0 ; i<MAXDTLINE ; i++ )
{
- m_bExist[i] = FALSE;
+ m_bExist[i] = false;
m_visitGoal[i] = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_visitDist[i] = 0.0f;
m_visitHeight[i] = 0.0f;
m_time[i] = 0.0f; // nothing displayed
}
- m_bHide = FALSE;
- m_bEnable = TRUE;
+ m_bHide = false;
+ m_bEnable = true;
m_delayFactor = 1.0f;
}
@@ -92,11 +92,11 @@ void CDisplayText::DeleteObject() // Management of an event.
-BOOL CDisplayText::EventProcess(const Event &event)
+bool CDisplayText::EventProcess(const Event &event)
{
int i;
- if ( m_engine->RetPause() ) return TRUE;
+ if ( m_engine->RetPause() ) return true;
if ( event.event == EVENT_FRAME )
{
@@ -105,7 +105,7 @@ BOOL CDisplayText::EventProcess(const Event &event) if ( !m_bExist[i] ) break;
m_time[i] -= event.rTime;
}
- while ( TRUE )
+ while ( true )
{
if ( !m_bExist[0] ||
m_time[0] > 0.0f ) break;
@@ -113,7 +113,7 @@ BOOL CDisplayText::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -251,7 +251,7 @@ void CDisplayText::DisplayText(char *text, D3DVECTOR goal, float height, if ( type == TT_MESSAGE ) icon = 11; // yellow
pw->CreateGroup(pos, dim, icon, EventMsg(EVENT_DT_GROUP0+nLine));
- pw->SetTrashEvent(FALSE);
+ pw->SetTrashEvent(false);
ppos = pos;
ppos.y -= hLine/2.0f;
@@ -272,7 +272,7 @@ void CDisplayText::DisplayText(char *text, D3DVECTOR goal, float height, button->ClearState(STATE_ENABLE);
}
- m_bExist[nLine] = TRUE;
+ m_bExist[nLine] = true;
m_visitGoal[nLine] = goal;
m_visitDist[nLine] = dist;
m_visitHeight[nLine] = height;
@@ -339,7 +339,7 @@ void CDisplayText::ClearText() pw->DeleteControl(EventMsg(EVENT_DT_LABEL0+i));
pw->DeleteControl(EventMsg(EVENT_DT_VISIT0+i));
}
- m_bExist[i] = FALSE;
+ m_bExist[i] = false;
m_visitGoal[i] = D3DVECTOR(0.0f, 0.0f, 0.0f);
m_visitDist[i] = 0.0f;
m_visitHeight[i] = 0.0f;
@@ -349,7 +349,7 @@ void CDisplayText::ClearText() // Hides or shows all texts.
-void CDisplayText::HideText(BOOL bHide)
+void CDisplayText::HideText(bool bHide)
{
CWindow* pw;
CGroup* pg;
@@ -386,7 +386,7 @@ void CDisplayText::HideText(BOOL bHide) // Removes the last text (top of the list).
-BOOL CDisplayText::ClearLastText()
+bool CDisplayText::ClearLastText()
{
CWindow *pw;
CButton *pb1, *pb2;
@@ -395,14 +395,14 @@ BOOL CDisplayText::ClearLastText() int i;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW2);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
pb2 = (CButton*)pw->SearchControl(EVENT_DT_VISIT0);
- if ( pb2 == 0 ) return FALSE; // same not of first-line
+ if ( pb2 == 0 ) return false; // same not of first-line
pg2 = (CGroup*)pw->SearchControl(EVENT_DT_GROUP0);
- if ( pg2 == 0 ) return FALSE;
+ if ( pg2 == 0 ) return false;
pl2 = (CLabel*)pw->SearchControl(EVENT_DT_LABEL0);
- if ( pl2 == 0 ) return FALSE;
+ if ( pl2 == 0 ) return false;
for ( i=0 ; i<MAXDTLINE-1 ; i++ )
{
@@ -432,8 +432,8 @@ BOOL CDisplayText::ClearLastText() pw->DeleteControl(EventMsg(EVENT_DT_VISIT0+i));
pw->DeleteControl(EventMsg(EVENT_DT_GROUP0+i));
pw->DeleteControl(EventMsg(EVENT_DT_LABEL0+i));
- m_bExist[i] = FALSE;
- return TRUE;
+ m_bExist[i] = false;
+ return true;
}
@@ -447,7 +447,7 @@ void CDisplayText::SetDelay(float factor) // Enables the display of text.
-void CDisplayText::SetEnable(BOOL bEnable)
+void CDisplayText::SetEnable(bool bEnable)
{
m_bEnable = bEnable;
}
@@ -574,19 +574,19 @@ void CDisplayText::SetVisit(EventMsg event) // Indicates whether a button is set to "visit".
-BOOL CDisplayText::IsVisit(EventMsg event)
+bool CDisplayText::IsVisit(EventMsg event)
{
CWindow* pw;
CButton* pb;
int i;
i = event-EVENT_DT_VISIT0;
- if ( i < 0 || i >= MAXDTLINE ) return FALSE;
+ if ( i < 0 || i >= MAXDTLINE ) return false;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW2);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
pb = (CButton*)pw->SearchControl(EventMsg(EVENT_DT_VISIT0+i));
- if ( pb == 0 ) return FALSE;
+ if ( pb == 0 ) return false;
return (pb->RetIcon() == 48); // > ?
}
diff --git a/src/ui/displaytext.h b/src/ui/displaytext.h index 67d9c77..934fc50 100644 --- a/src/ui/displaytext.h +++ b/src/ui/displaytext.h @@ -48,17 +48,17 @@ public: void DeleteObject();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void DisplayError(Error err, CObject* pObj, float time=10.0f);
void DisplayError(Error err, D3DVECTOR goal, float height=15.0f, float dist=60.0f, float time=10.0f);
void DisplayText(char *text, CObject* pObj, float time=10.0f, TextType type=TT_INFO);
void DisplayText(char *text, D3DVECTOR goal, float height=15.0f, float dist=60.0f, float time=10.0f, TextType type=TT_INFO);
- void HideText(BOOL bHide);
+ void HideText(bool bHide);
void ClearText();
- BOOL ClearLastText();
+ bool ClearLastText();
void SetDelay(float factor);
- void SetEnable(BOOL bEnable);
+ void SetEnable(bool bEnable);
D3DVECTOR RetVisitGoal(EventMsg event);
float RetVisitDist(EventMsg event);
@@ -69,7 +69,7 @@ public: void ClearVisit();
void SetVisit(EventMsg event);
- BOOL IsVisit(EventMsg event);
+ bool IsVisit(EventMsg event);
protected:
CObject* SearchToto();
@@ -80,14 +80,14 @@ protected: CInterface* m_interface;
CSound* m_sound;
- BOOL m_bExist[MAXDTLINE];
+ bool m_bExist[MAXDTLINE];
float m_time[MAXDTLINE];
D3DVECTOR m_visitGoal[MAXDTLINE];
float m_visitDist[MAXDTLINE];
float m_visitHeight[MAXDTLINE];
- BOOL m_bHide;
- BOOL m_bEnable;
+ bool m_bHide;
+ bool m_bEnable;
float m_delayFactor;
};
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index 42aaf0b..72c1137 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -51,7 +51,7 @@ // Indicates whether a character is a space.
-BOOL IsSpace(int character)
+bool IsSpace(int character)
{
return ( character == ' ' ||
character == '\t' ||
@@ -60,7 +60,7 @@ BOOL IsSpace(int character) // Indicates whether a character is part of a word.
-BOOL IsWord(int character)
+bool IsWord(int character)
{
char c;
@@ -73,9 +73,9 @@ BOOL IsWord(int character) // Indicates whether a character is a word separator.
-BOOL IsSep(int character)
+bool IsSep(int character)
{
- if ( IsSpace(character) ) return FALSE;
+ if ( IsSpace(character) ) return false;
return !IsWord(character);
}
@@ -95,14 +95,14 @@ CEdit::CEdit(CInstanceManager* iMan) : CControl(iMan) m_fontType = FONT_COURIER;
m_scroll = 0;
- m_bEdit = TRUE;
- m_bHilite = TRUE;
- m_bInsideScroll = TRUE;
- m_bCapture = FALSE;
- m_bDisplaySpec = FALSE;
- m_bSoluce = FALSE;
- m_bGeneric = FALSE;
- m_bAutoIndent = FALSE;
+ m_bEdit = true;
+ m_bHilite = true;
+ m_bInsideScroll = true;
+ m_bCapture = false;
+ m_bDisplaySpec = false;
+ m_bSoluce = false;
+ m_bGeneric = false;
+ m_bAutoIndent = false;
m_cursor1 = 0;
m_cursor2 = 0;
m_column = 0;
@@ -114,7 +114,7 @@ CEdit::CEdit(CInstanceManager* iMan) : CControl(iMan) {
m_undo[i].text = 0;
}
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
m_undoOper = OPERUNDO_SPEC;
}
@@ -139,7 +139,7 @@ CEdit::~CEdit() // Creates a new editable line.
-BOOL CEdit::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CEdit::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
CScroll* pc;
FPOINT start, end;
@@ -154,15 +154,15 @@ BOOL CEdit::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) m_timeLastClick = 0.0f;
m_timeLastScroll = 0.0f;
- m_bMulti = FALSE;
+ m_bMulti = false;
MoveAdjust();
if ( m_lineVisible <= 1 )
{
- m_bMulti = FALSE;
+ m_bMulti = false;
}
else
{
- m_bMulti = TRUE;
+ m_bMulti = true;
MoveAdjust(); // readjusts multi-line mode
m_scroll = new CScroll(m_iMan);
pc = (CScroll*)m_scroll;
@@ -170,7 +170,7 @@ BOOL CEdit::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) MoveAdjust();
}
- return TRUE;
+ return true;
}
@@ -228,31 +228,31 @@ void CEdit::MoveAdjust() pos.x = m_pos.x+m_dim.x-(m_bMulti?SCROLL_WIDTH:0.0f);
pos.y = m_pos.y;
- GlintCreate(pos, FALSE, FALSE);
+ GlintCreate(pos, false, false);
}
// Management of an event.
-BOOL CEdit::EventProcess(const Event &event)
+bool CEdit::EventProcess(const Event &event)
{
- BOOL bShift, bControl;
+ bool bShift, bControl;
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
if ( event.event == EVENT_KEYDOWN &&
event.param == VK_WHEELUP &&
Detect(event.pos) )
{
- Scroll(m_lineFirst-3, TRUE);
- return TRUE;
+ Scroll(m_lineFirst-3, true);
+ return true;
}
if ( event.event == EVENT_KEYDOWN &&
event.param == VK_WHEELDOWN &&
Detect(event.pos) )
{
- Scroll(m_lineFirst+3, TRUE);
- return TRUE;
+ Scroll(m_lineFirst+3, true);
+ return true;
}
CControl::EventProcess(event);
@@ -293,7 +293,7 @@ BOOL CEdit::EventProcess(const Event &event) if ( event.event == m_scroll->RetEventMsg() )
{
Scroll();
- return TRUE;
+ return true;
}
}
@@ -306,25 +306,25 @@ BOOL CEdit::EventProcess(const Event &event) (event.param == VK_DELETE && bShift && !bControl) )
{
Cut();
- return TRUE;
+ return true;
}
if ( (event.param == 'C' && !bShift && bControl) ||
(event.param == VK_INSERT && !bShift && bControl) )
{
Copy();
- return TRUE;
+ return true;
}
if ( (event.param == 'V' && !bShift && bControl) ||
(event.param == VK_INSERT && bShift && !bControl) )
{
Paste();
- return TRUE;
+ return true;
}
if ( event.param == 'A' && !bShift && bControl )
{
SetCursor(999999, 0);
- return TRUE;
+ return true;
}
if ( event.param == 'O' && !bShift && bControl )
@@ -343,25 +343,25 @@ BOOL CEdit::EventProcess(const Event &event) if ( event.param == 'Z' && !bShift && bControl )
{
Undo();
- return TRUE;
+ return true;
}
if ( event.param == 'U' && !bShift && bControl )
{
- if ( MinMaj(FALSE) ) return TRUE;
+ if ( MinMaj(false) ) return true;
}
if ( event.param == 'U' && bShift && bControl )
{
- if ( MinMaj(TRUE) ) return TRUE;
+ if ( MinMaj(true) ) return true;
}
if ( event.param == VK_TAB && !bShift && !bControl && !m_bAutoIndent )
{
- if ( Shift(FALSE) ) return TRUE;
+ if ( Shift(false) ) return true;
}
if ( event.param == VK_TAB && bShift && !bControl && !m_bAutoIndent )
{
- if ( Shift(TRUE) ) return TRUE;
+ if ( Shift(true) ) return true;
}
if ( m_bEdit )
@@ -369,33 +369,33 @@ BOOL CEdit::EventProcess(const Event &event) if ( event.param == VK_LEFT )
{
MoveChar(-1, bControl, bShift);
- return TRUE;
+ return true;
}
if ( event.param == VK_RIGHT )
{
MoveChar(1, bControl, bShift);
- return TRUE;
+ return true;
}
if ( event.param == VK_UP )
{
MoveLine(-1, bControl, bShift);
- return TRUE;
+ return true;
}
if ( event.param == VK_DOWN )
{
MoveLine(1, bControl, bShift);
- return TRUE;
+ return true;
}
if ( event.param == VK_PRIOR ) // PageUp ?
{
MoveLine(-(m_lineVisible-1), bControl, bShift);
- return TRUE;
+ return true;
}
if ( event.param == VK_NEXT ) // PageDown ?
{
MoveLine(m_lineVisible-1, bControl, bShift);
- return TRUE;
+ return true;
}
}
else
@@ -403,63 +403,63 @@ BOOL CEdit::EventProcess(const Event &event) if ( event.param == VK_LEFT ||
event.param == VK_UP )
{
- Scroll(m_lineFirst-1, TRUE);
- return TRUE;
+ Scroll(m_lineFirst-1, true);
+ return true;
}
if ( event.param == VK_RIGHT ||
event.param == VK_DOWN )
{
- Scroll(m_lineFirst+1, TRUE);
- return TRUE;
+ Scroll(m_lineFirst+1, true);
+ return true;
}
if ( event.param == VK_PRIOR ) // PageUp ?
{
- Scroll(m_lineFirst-(m_lineVisible-1), TRUE);
- return TRUE;
+ Scroll(m_lineFirst-(m_lineVisible-1), true);
+ return true;
}
if ( event.param == VK_NEXT ) // PageDown ?
{
- Scroll(m_lineFirst+(m_lineVisible-1), TRUE);
- return TRUE;
+ Scroll(m_lineFirst+(m_lineVisible-1), true);
+ return true;
}
}
if ( event.param == VK_HOME )
{
MoveHome(bControl, bShift);
- return TRUE;
+ return true;
}
if ( event.param == VK_END )
{
MoveEnd(bControl, bShift);
- return TRUE;
+ return true;
}
if ( event.param == VK_BACK ) // backspace ( <- ) ?
{
Delete(-1);
SendModifEvent();
- return TRUE;
+ return true;
}
if ( event.param == VK_DELETE )
{
Delete(1);
SendModifEvent();
- return TRUE;
+ return true;
}
if ( event.param == VK_RETURN )
{
Insert('\n');
SendModifEvent();
- return TRUE;
+ return true;
}
if ( event.param == VK_TAB )
{
Insert('\t');
SendModifEvent();
- return TRUE;
+ return true;
}
}
@@ -469,7 +469,7 @@ BOOL CEdit::EventProcess(const Event &event) {
Insert((char)event.param);
SendModifEvent();
- return TRUE;
+ return true;
}
}
@@ -477,11 +477,11 @@ BOOL CEdit::EventProcess(const Event &event) {
if ( event.param == m_eventMsg )
{
- m_bFocus = TRUE;
+ m_bFocus = true;
}
else
{
- m_bFocus = FALSE;
+ m_bFocus = false;
}
}
@@ -494,13 +494,13 @@ BOOL CEdit::EventProcess(const Event &event) if ( event.pos.x < m_pos.x+m_dim.x-(m_bMulti?MARGX+SCROLL_WIDTH:0.0f) )
{
MouseClick(event.pos);
- if ( m_bEdit || m_bHilite ) m_bCapture = TRUE;
+ if ( m_bEdit || m_bHilite ) m_bCapture = true;
}
- m_bFocus = TRUE;
+ m_bFocus = true;
}
else
{
- m_bFocus = FALSE;
+ m_bFocus = false;
}
}
@@ -531,11 +531,11 @@ BOOL CEdit::EventProcess(const Event &event) MouseDoubleClick(event.pos);
}
m_timeLastClick = m_time;
- m_bCapture = FALSE;
+ m_bCapture = false;
}
}
- return TRUE;
+ return true;
}
@@ -552,18 +552,18 @@ void CEdit::SendModifEvent() // Detects whether the mouse is over a hyperlink character.
-BOOL CEdit::IsLinkPos(FPOINT pos)
+bool CEdit::IsLinkPos(FPOINT pos)
{
int i;
- if ( m_format == 0 ) return FALSE;
+ if ( m_format == 0 ) return false;
i = MouseDetect(pos);
- if ( i == -1 ) return FALSE;
- if ( i >= m_len ) return FALSE;
+ if ( i == -1 ) return false;
+ if ( i >= m_len ) return false;
- if ( (m_format[i]&COLOR_MASK) == COLOR_LINK ) return TRUE;
- return FALSE;
+ if ( (m_format[i]&COLOR_MASK) == COLOR_LINK ) return true;
+ return false;
}
@@ -600,7 +600,7 @@ void CEdit::MouseDoubleClick(FPOINT mouse) m_cursor1 = m_len; // selects all
}
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
Justif();
ColumnFix();
@@ -619,7 +619,7 @@ void CEdit::MouseClick(FPOINT mouse) {
m_cursor1 = i;
m_cursor2 = i;
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
m_timeBlink = 0.0f; // lights the cursor immediately
ColumnFix();
}
@@ -664,12 +664,12 @@ void CEdit::MouseMove(FPOINT mouse) {
if ( mouse.y > m_pos.y+m_dim.y ) // above?
{
- Scroll(m_lineFirst-1, FALSE);
+ Scroll(m_lineFirst-1, false);
mouse.y = m_pos.y+m_dim.y-MARGY-m_lineHeight/2.0f;
}
if ( mouse.y < m_pos.y ) // lower?
{
- Scroll(m_lineFirst+1, FALSE);
+ Scroll(m_lineFirst+1, false);
mouse.y = m_pos.y+m_dim.y-MARGY-m_lineVisible*m_lineHeight+m_lineHeight/2.0f;
}
m_timeLastScroll = m_time;
@@ -679,7 +679,7 @@ void CEdit::MouseMove(FPOINT mouse) if ( i != -1 )
{
m_cursor1 = i;
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
m_timeBlink = 0.0f; // lights the cursor immediately
ColumnFix();
}
@@ -692,7 +692,7 @@ int CEdit::MouseDetect(FPOINT mouse) FPOINT pos;
float indentLength, offset, size;
int i, len, c;
- BOOL bTitle;
+ bool bTitle;
if ( m_bAutoIndent )
{
@@ -815,21 +815,21 @@ void CEdit::HyperJump(char *name, char *marker) // Adds text to the history of visited.
-BOOL CEdit::HyperAdd(char *filename, int firstLine)
+bool CEdit::HyperAdd(char *filename, int firstLine)
{
- if ( m_historyCurrent >= EDITHISTORYMAX-1 ) return FALSE;
+ if ( m_historyCurrent >= EDITHISTORYMAX-1 ) return false;
m_historyCurrent ++;
strcpy(m_history[m_historyCurrent].filename, filename);
m_history[m_historyCurrent].firstLine = firstLine;
m_historyTotal = m_historyCurrent+1;
- return TRUE;
+ return true;
}
// Indicates whether a button EVENT_HYPER_ * is active or not.
-BOOL CEdit::HyperTest(EventMsg event)
+bool CEdit::HyperTest(EventMsg event)
{
if ( event == EVENT_HYPER_HOME )
{
@@ -846,14 +846,14 @@ BOOL CEdit::HyperTest(EventMsg event) return ( m_historyCurrent < m_historyTotal-1 );
}
- return FALSE;
+ return false;
}
// Performs the action corresponding to a button EVENT_HYPER_ *.
-BOOL CEdit::HyperGo(EventMsg event)
+bool CEdit::HyperGo(EventMsg event)
{
- if ( !HyperTest(event) ) return FALSE;
+ if ( !HyperTest(event) ) return false;
m_history[m_historyCurrent].firstLine = m_lineFirst;
@@ -875,7 +875,7 @@ BOOL CEdit::HyperGo(EventMsg event) ReadText(m_history[m_historyCurrent].filename);
Justif();
SetFirstLine(m_history[m_historyCurrent].firstLine);
- return TRUE;
+ return true;
}
@@ -1233,10 +1233,10 @@ void CEdit::DrawPart(FPOINT pos, FPOINT dim, int icon) // Give the text to edit.
-void CEdit::SetText(char *text, BOOL bNew)
+void CEdit::SetText(char *text, bool bNew)
{
int i, j, font;
- BOOL bBOL;
+ bool bBOL;
if ( !bNew ) UndoMemorize(OPERUNDO_SPEC);
@@ -1248,7 +1248,7 @@ void CEdit::SetText(char *text, BOOL bNew) if ( m_bAutoIndent )
{
j = 0;
- bBOL = TRUE;
+ bBOL = true;
for ( i=0 ; i<m_len ; i++ )
{
if ( text[i] == '\t' )
@@ -1271,7 +1271,7 @@ void CEdit::SetText(char *text, BOOL bNew) {
font = m_fontType;
j = 0;
- bBOL = TRUE;
+ bBOL = true;
for ( i=0 ; i<m_len ; i++ )
{
if ( m_bAutoIndent )
@@ -1443,7 +1443,7 @@ void CEdit::LoadImage(char *name) // Read from a text file.
-BOOL CEdit::ReadText(char *filename, int addSize)
+bool CEdit::ReadText(char *filename, int addSize)
{
FILE *file = NULL;
char *buffer;
@@ -1452,11 +1452,11 @@ BOOL CEdit::ReadText(char *filename, int addSize) char text[50];
float iWidth;
KeyRank key;
- BOOL bInSoluce, bBOL;
+ bool bInSoluce, bBOL;
- if ( filename[0] == 0 ) return FALSE;
+ if ( filename[0] == 0 ) return false;
file = fopen(filename, "rb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
fseek(file, 0, SEEK_END);
len = ftell(file);
@@ -1481,14 +1481,14 @@ BOOL CEdit::ReadText(char *filename, int addSize) fclose(file);
- bInSoluce = FALSE;
+ bInSoluce = false;
font = m_fontType;
iIndex = 0;
iLink = 0;
m_imageTotal = 0;
m_markerTotal = 0;
i = j = 0;
- bBOL = TRUE;
+ bBOL = true;
while ( i < m_len )
{
if ( m_bAutoIndent )
@@ -1754,7 +1754,7 @@ BOOL CEdit::ReadText(char *filename, int addSize) buffer[i+2] == 's' &&
buffer[i+3] == ';' )
{
- bInSoluce = TRUE;
+ bInSoluce = true;
i += 4;
}
else if ( m_format != 0 &&
@@ -1763,7 +1763,7 @@ BOOL CEdit::ReadText(char *filename, int addSize) buffer[i+2] == 's' &&
buffer[i+3] == ';' )
{
- bInSoluce = FALSE;
+ bInSoluce = false;
i += 4;
}
else if ( m_format != 0 &&
@@ -1857,21 +1857,21 @@ BOOL CEdit::ReadText(char *filename, int addSize) Justif();
ColumnFix();
- return TRUE;
+ return true;
}
// Writes all the text in a file.
-BOOL CEdit::WriteText(char *filename)
+bool CEdit::WriteText(char *filename)
{
FILE* file;
char buffer[1000+20];
int i, j, k, n;
float iDim;
- if ( filename[0] == 0 ) return FALSE;
+ if ( filename[0] == 0 ) return false;
file = fopen(filename, "wb");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
if ( m_bAutoIndent )
{
@@ -1921,7 +1921,7 @@ BOOL CEdit::WriteText(char *filename) Justif();
}
- return TRUE;
+ return true;
}
@@ -1955,60 +1955,60 @@ int CEdit::RetMaxChar() // Mode management "editable".
-void CEdit::SetEditCap(BOOL bMode)
+void CEdit::SetEditCap(bool bMode)
{
m_bEdit = bMode;
}
-BOOL CEdit::RetEditCap()
+bool CEdit::RetEditCap()
{
return m_bEdit;
}
// Mode management "hilitable" (that's the franch).
-void CEdit::SetHiliteCap(BOOL bEnable)
+void CEdit::SetHiliteCap(bool bEnable)
{
m_bHilite = bEnable;
}
-BOOL CEdit::RetHiliteCap()
+bool CEdit::RetHiliteCap()
{
return m_bHilite;
}
// Lift in / out connection.
-void CEdit::SetInsideScroll(BOOL bInside)
+void CEdit::SetInsideScroll(bool bInside)
{
m_bInsideScroll = bInside;
}
-BOOL CEdit::RetInsideScroll()
+bool CEdit::RetInsideScroll()
{
return m_bInsideScroll;
}
// Specifies whether to display the links showing the solution.
-void CEdit::SetSoluceMode(BOOL bSoluce)
+void CEdit::SetSoluceMode(bool bSoluce)
{
m_bSoluce = bSoluce;
}
-BOOL CEdit::RetSoluceMode()
+bool CEdit::RetSoluceMode()
{
return m_bSoluce;
}
// Indicates whether the text is a defile that generic.
-void CEdit::SetGenericMode(BOOL bGeneric)
+void CEdit::SetGenericMode(bool bGeneric)
{
m_bGeneric = bGeneric;
}
-BOOL CEdit::RetGenericMode()
+bool CEdit::RetGenericMode()
{
return m_bGeneric;
}
@@ -2016,12 +2016,12 @@ BOOL CEdit::RetGenericMode() // Management of automatic indentation mode with {}.
-void CEdit::SetAutoIndent(BOOL bMode)
+void CEdit::SetAutoIndent(bool bMode)
{
m_bAutoIndent = bMode;
}
-BOOL CEdit::RetAutoIndent()
+bool CEdit::RetAutoIndent()
{
return m_bAutoIndent;
}
@@ -2037,7 +2037,7 @@ void CEdit::SetCursor(int cursor1, int cursor2) m_cursor1 = cursor1;
m_cursor2 = cursor2;
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
ColumnFix();
}
@@ -2054,7 +2054,7 @@ void CEdit::GetCursor(int &cursor1, int &cursor2) void CEdit::SetFirstLine(int rank)
{
- Scroll(rank, TRUE);
+ Scroll(rank, true);
}
// Returns the first displayed line.
@@ -2098,25 +2098,25 @@ void CEdit::ShowSelect() {
line -= m_lineVisible-1;
if ( line < 0 ) line = 0;
- Scroll(line, FALSE);
+ Scroll(line, false);
}
line = RetCursorLine(cursor1);
if ( line < m_lineFirst )
{
- Scroll(line, FALSE);
+ Scroll(line, false);
}
}
// Management of the display mode of special characters.
-void CEdit::SetDisplaySpec(BOOL bDisplay)
+void CEdit::SetDisplaySpec(bool bDisplay)
{
m_bDisplaySpec = bDisplay;
}
-BOOL CEdit::RetDisplaySpec()
+bool CEdit::RetDisplaySpec()
{
return m_bDisplaySpec;
}
@@ -2124,7 +2124,7 @@ BOOL CEdit::RetDisplaySpec() // Multi-fonts mode management.
-void CEdit::SetMultiFont(BOOL bMulti)
+void CEdit::SetMultiFont(bool bMulti)
{
if ( bMulti )
{
@@ -2139,7 +2139,7 @@ void CEdit::SetMultiFont(BOOL bMulti) }
}
-BOOL CEdit::RetMultiFont()
+bool CEdit::RetMultiFont()
{
return ( m_format != 0 );
}
@@ -2165,13 +2165,13 @@ void CEdit::Scroll() {
value = m_scroll->RetVisibleValue();
value *= m_lineTotal-m_lineVisible;
- Scroll((int)(value+0.5f), TRUE);
+ Scroll((int)(value+0.5f), true);
}
}
// Moves according to the visible lift.
-void CEdit::Scroll(int pos, BOOL bAdjustCursor)
+void CEdit::Scroll(int pos, bool bAdjustCursor)
{
int max, line;
@@ -2190,14 +2190,14 @@ void CEdit::Scroll(int pos, BOOL bAdjustCursor) // Cursor too high?
if ( line < m_lineFirst )
{
- MoveLine(m_lineFirst-line, FALSE, FALSE);
+ MoveLine(m_lineFirst-line, false, false);
return;
}
// Cursor too low?
if ( line >= m_lineFirst+m_lineVisible )
{
- MoveLine(m_lineFirst+m_lineVisible-line-1, FALSE, FALSE);
+ MoveLine(m_lineFirst+m_lineVisible-line-1, false, false);
return;
}
}
@@ -2207,7 +2207,7 @@ void CEdit::Scroll(int pos, BOOL bAdjustCursor) // Moves the cursor to the beginning of the line.
-void CEdit::MoveHome(BOOL bWord, BOOL bSelect)
+void CEdit::MoveHome(bool bWord, bool bSelect)
{
int begin, tab;
@@ -2240,14 +2240,14 @@ void CEdit::MoveHome(BOOL bWord, BOOL bSelect) }
if ( !bSelect ) m_cursor2 = m_cursor1;
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
Justif();
ColumnFix();
}
// Moves the cursor to the end of the line.
-void CEdit::MoveEnd(BOOL bWord, BOOL bSelect)
+void CEdit::MoveEnd(bool bWord, bool bSelect)
{
if ( bWord )
{
@@ -2262,14 +2262,14 @@ void CEdit::MoveEnd(BOOL bWord, BOOL bSelect) }
if ( !bSelect ) m_cursor2 = m_cursor1;
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
Justif();
ColumnFix();
}
// Moves the cursor through characters.
-void CEdit::MoveChar(int move, BOOL bWord, BOOL bSelect)
+void CEdit::MoveChar(int move, bool bWord, bool bSelect)
{
int character;
@@ -2375,14 +2375,14 @@ void CEdit::MoveChar(int move, BOOL bWord, BOOL bSelect) if ( !bSelect ) m_cursor2 = m_cursor1;
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
Justif();
ColumnFix();
}
// Moves the cursor lines.
-void CEdit::MoveLine(int move, BOOL bWord, BOOL bSelect)
+void CEdit::MoveLine(int move, bool bWord, bool bSelect)
{
float column, indentLength;
int i, line, c;
@@ -2448,7 +2448,7 @@ void CEdit::MoveLine(int move, BOOL bWord, BOOL bSelect) m_cursor1 = m_lineOffset[line]+c;
if ( !bSelect ) m_cursor2 = m_cursor1;
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
Justif();
}
@@ -2492,14 +2492,14 @@ void CEdit::ColumnFix() // Cut the selected characters or entire line.
-BOOL CEdit::Cut()
+bool CEdit::Cut()
{
HGLOBAL hg;
char* text;
char c;
int c1, c2, start, len, i, j;
- if ( !m_bEdit ) return FALSE;
+ if ( !m_bEdit ) return false;
c1 = m_cursor1;
c2 = m_cursor2;
@@ -2519,19 +2519,19 @@ BOOL CEdit::Cut() }
}
- if ( c1 == c2 ) return FALSE;
+ if ( c1 == c2 ) return false;
start = c1;
len = c2-c1;
if ( !(hg = GlobalAlloc(GMEM_DDESHARE, len*2+1)) )
{
- return FALSE;
+ return false;
}
if ( !(text = (char*)GlobalLock(hg)) )
{
GlobalFree(hg);
- return FALSE;
+ return false;
}
j = 0;
@@ -2547,17 +2547,17 @@ BOOL CEdit::Cut() if ( !OpenClipboard(NULL) )
{
GlobalFree(hg);
- return FALSE;
+ return false;
}
if ( !EmptyClipboard() )
{
GlobalFree(hg);
- return FALSE;
+ return false;
}
if ( !SetClipboardData(CF_TEXT, hg) )
{
GlobalFree(hg);
- return FALSE;
+ return false;
}
CloseClipboard();
@@ -2568,12 +2568,12 @@ BOOL CEdit::Cut() Justif();
ColumnFix();
SendModifEvent();
- return TRUE;
+ return true;
}
// Copy the selected characters or entire line.
-BOOL CEdit::Copy()
+bool CEdit::Copy()
{
HGLOBAL hg;
char* text;
@@ -2598,19 +2598,19 @@ BOOL CEdit::Copy() }
}
- if ( c1 == c2 ) return FALSE;
+ if ( c1 == c2 ) return false;
start = c1;
len = c2-c1;
if ( !(hg = GlobalAlloc(GMEM_DDESHARE, len*2+1)) )
{
- return FALSE;
+ return false;
}
if ( !(text = (char*)GlobalLock(hg)) )
{
GlobalFree(hg);
- return FALSE;
+ return false;
}
j = 0;
@@ -2626,48 +2626,48 @@ BOOL CEdit::Copy() if ( !OpenClipboard(NULL) )
{
GlobalFree(hg);
- return FALSE;
+ return false;
}
if ( !EmptyClipboard() )
{
GlobalFree(hg);
- return FALSE;
+ return false;
}
if ( !SetClipboardData(CF_TEXT, hg) )
{
GlobalFree(hg);
- return FALSE;
+ return false;
}
CloseClipboard();
- return TRUE;
+ return true;
}
// Paste the contents of the notebook.
-BOOL CEdit::Paste()
+bool CEdit::Paste()
{
HANDLE h;
char c;
char* p;
- if ( !m_bEdit ) return FALSE;
+ if ( !m_bEdit ) return false;
if ( !OpenClipboard(NULL) )
{
- return FALSE;
+ return false;
}
if ( !(h = GetClipboardData(CF_TEXT)) )
{
CloseClipboard();
- return FALSE;
+ return false;
}
if ( !(p = (char*)GlobalLock(h)) )
{
CloseClipboard();
- return FALSE;
+ return false;
}
UndoMemorize(OPERUNDO_SPEC);
@@ -2686,15 +2686,15 @@ BOOL CEdit::Paste() Justif();
ColumnFix();
SendModifEvent();
- return TRUE;
+ return true;
}
// Cancels the last action.
-BOOL CEdit::Undo()
+bool CEdit::Undo()
{
- if ( !m_bEdit ) return FALSE;
+ if ( !m_bEdit ) return false;
return UndoRecall();
}
@@ -2760,21 +2760,21 @@ void CEdit::Insert(char character) InsertOne('\n');
InsertOne('\n');
InsertOne('}');
- MoveChar(-1, FALSE, FALSE);
- MoveChar(-1, FALSE, FALSE);
+ MoveChar(-1, false, false);
+ MoveChar(-1, false, false);
}
#if 0
else if ( character == '(' )
{
InsertOne(character);
InsertOne(')');
- MoveChar(-1, FALSE, FALSE);
+ MoveChar(-1, false, false);
}
else if ( character == '[' )
{
InsertOne(character);
InsertOne(']');
- MoveChar(-1, FALSE, FALSE);
+ MoveChar(-1, false, false);
}
#endif
else if ( character == '\t' )
@@ -2947,12 +2947,12 @@ void CEdit::IndentTabAdjust(int number) // Indent the left or right the entire selection.
-BOOL CEdit::Shift(BOOL bLeft)
+bool CEdit::Shift(bool bLeft)
{
- BOOL bInvert = FALSE;
+ bool bInvert = false;
int c1, c2, i;
- if ( m_cursor1 == m_cursor2 ) return FALSE;
+ if ( m_cursor1 == m_cursor2 ) return false;
UndoMemorize(OPERUNDO_SPEC);
@@ -2961,16 +2961,16 @@ BOOL CEdit::Shift(BOOL bLeft) if ( c1 > c2 )
{
Swap(c1, c2); // always c1 <= c2
- bInvert = TRUE;
+ bInvert = true;
}
if ( c1 > 0 )
{
- if ( m_text[c1-1] != '\n' ) return FALSE;
+ if ( m_text[c1-1] != '\n' ) return false;
}
if ( c2 < m_len )
{
- if ( m_text[c2-1] != '\n' ) return FALSE;
+ if ( m_text[c2-1] != '\n' ) return false;
}
if ( bLeft ) // shifts left?
@@ -3007,16 +3007,16 @@ BOOL CEdit::Shift(BOOL bLeft) Justif();
ColumnFix();
SendModifEvent();
- return TRUE;
+ return true;
}
// Min conversion <-> shift the selection.
-BOOL CEdit::MinMaj(BOOL bMaj)
+bool CEdit::MinMaj(bool bMaj)
{
int c1, c2, i, character;
- if ( m_cursor1 == m_cursor2 ) return FALSE;
+ if ( m_cursor1 == m_cursor2 ) return false;
UndoMemorize(OPERUNDO_SPEC);
@@ -3035,7 +3035,7 @@ BOOL CEdit::MinMaj(BOOL bMaj) Justif();
ColumnFix();
SendModifEvent();
- return TRUE;
+ return true;
}
@@ -3045,7 +3045,7 @@ void CEdit::Justif() {
float width, value, size, indentLength;
int i, j, line, indent;
- BOOL bDual, bString, bRem;
+ bool bDual, bString, bRem;
indent = 0;
m_lineTotal = 0;
@@ -3059,11 +3059,11 @@ void CEdit::Justif() * m_engine->RetEditIndentValue();
}
- bString = bRem = FALSE;
+ bString = bRem = false;
i = 0;
- while ( TRUE )
+ while ( true )
{
- bDual = FALSE;
+ bDual = false;
width = m_dim.x-(10.0f/640.0f)*2.0f-(m_bMulti?MARGX*2.0f+SCROLL_WIDTH:0.0f);
if ( m_bAutoIndent )
@@ -3084,7 +3084,7 @@ void CEdit::Justif() if ( (m_format[i]&TITLE_MASK) == TITLE_BIG ) // headline?
{
size *= BIG_FONT;
- bDual = TRUE;
+ bDual = true;
}
if ( (m_format[i]&IMAGE_MASK) != 0 ) // image part?
@@ -3108,8 +3108,8 @@ void CEdit::Justif() if ( !bRem && m_text[j] == '\"' ) bString = !bString;
if ( !bString &&
m_text[j] == '/' &&
- m_text[j+1] == '/' ) bRem = TRUE;
- if ( m_text[j] == '\n' ) bString = bRem = FALSE;
+ m_text[j+1] == '/' ) bRem = true;
+ if ( m_text[j] == '\n' ) bString = bRem = false;
if ( m_text[j] == '{' && !bString && !bRem ) indent ++;
if ( m_text[j] == '}' && !bString && !bRem ) indent --;
}
@@ -3221,7 +3221,7 @@ void CEdit::UndoFlush() m_undo[i].text = 0;
}
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
m_undoOper = OPERUNDO_SPEC;
}
@@ -3236,7 +3236,7 @@ void CEdit::UndoMemorize(OperUndo oper) m_undoOper != OPERUNDO_SPEC &&
oper == m_undoOper ) return;
- m_bUndoForce = FALSE;
+ m_bUndoForce = false;
m_undoOper = oper;
delete m_undo[EDITUNDOMAX-1].text;
@@ -3259,11 +3259,11 @@ void CEdit::UndoMemorize(OperUndo oper) // Back to previous state.
-BOOL CEdit::UndoRecall()
+bool CEdit::UndoRecall()
{
int i;
- if ( m_undo[0].text == 0 ) return FALSE;
+ if ( m_undo[0].text == 0 ) return false;
m_len = m_undo[0].len;
memcpy(m_text, m_undo[0].text, m_len);
@@ -3278,41 +3278,41 @@ BOOL CEdit::UndoRecall() }
m_undo[EDITUNDOMAX-1].text = 0;
- m_bUndoForce = TRUE;
+ m_bUndoForce = true;
Justif();
ColumnFix();
SendModifEvent();
- return TRUE;
+ return true;
}
// Clears the format of all characters.
-BOOL CEdit::ClearFormat()
+bool CEdit::ClearFormat()
{
if ( m_format == 0 )
{
- SetMultiFont(TRUE);
+ SetMultiFont(true);
}
memset(m_format, m_fontType, m_len);
- return TRUE;
+ return true;
}
// Changes the format of a sequence of characters.
-BOOL CEdit::SetFormat(int cursor1, int cursor2, int format)
+bool CEdit::SetFormat(int cursor1, int cursor2, int format)
{
int i;
- if ( m_format == 0 ) return FALSE;
+ if ( m_format == 0 ) return false;
for ( i=cursor1 ; i<cursor2 ; i++ )
{
m_format[i] |= format;
}
- return TRUE;
+ return true;
}
diff --git a/src/ui/edit.h b/src/ui/edit.h index eccc67e..fb6d7ae 100644 --- a/src/ui/edit.h +++ b/src/ui/edit.h @@ -93,42 +93,42 @@ public: CEdit(CInstanceManager* iMan);
virtual ~CEdit();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
void SetPos(FPOINT pos);
void SetDim(FPOINT dim);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
- void SetText(char *text, BOOL bNew=TRUE);
+ void SetText(char *text, bool bNew=true);
void GetText(char *buffer, int max);
char* RetText();
int RetTextLength();
- BOOL ReadText(char *filename, int addSize=0);
- BOOL WriteText(char *filename);
+ bool ReadText(char *filename, int addSize=0);
+ bool WriteText(char *filename);
void SetMaxChar(int max);
int RetMaxChar();
- void SetEditCap(BOOL bMode);
- BOOL RetEditCap();
+ void SetEditCap(bool bMode);
+ bool RetEditCap();
- void SetHiliteCap(BOOL bEnable);
- BOOL RetHiliteCap();
+ void SetHiliteCap(bool bEnable);
+ bool RetHiliteCap();
- void SetInsideScroll(BOOL bInside);
- BOOL RetInsideScroll();
+ void SetInsideScroll(bool bInside);
+ bool RetInsideScroll();
- void SetSoluceMode(BOOL bSoluce);
- BOOL RetSoluceMode();
+ void SetSoluceMode(bool bSoluce);
+ bool RetSoluceMode();
- void SetGenericMode(BOOL bGeneric);
- BOOL RetGenericMode();
+ void SetGenericMode(bool bGeneric);
+ bool RetGenericMode();
- void SetAutoIndent(BOOL bMode);
- BOOL RetAutoIndent();
+ void SetAutoIndent(bool bMode);
+ bool RetAutoIndent();
void SetCursor(int cursor1, int cursor2);
void GetCursor(int &cursor1, int &cursor2);
@@ -137,30 +137,30 @@ public: int RetFirstLine();
void ShowSelect();
- void SetDisplaySpec(BOOL bDisplay);
- BOOL RetDisplaySpec();
+ void SetDisplaySpec(bool bDisplay);
+ bool RetDisplaySpec();
- void SetMultiFont(BOOL bMulti);
- BOOL RetMultiFont();
+ void SetMultiFont(bool bMulti);
+ bool RetMultiFont();
- BOOL Cut();
- BOOL Copy();
- BOOL Paste();
- BOOL Undo();
+ bool Cut();
+ bool Copy();
+ bool Paste();
+ bool Undo();
void HyperFlush();
void HyperHome(char *filename);
- BOOL HyperTest(EventMsg event);
- BOOL HyperGo(EventMsg event);
+ bool HyperTest(EventMsg event);
+ bool HyperGo(EventMsg event);
void SetFontSize(float size);
- BOOL ClearFormat();
- BOOL SetFormat(int cursor1, int cursor2, int format);
+ bool ClearFormat();
+ bool SetFormat(int cursor1, int cursor2, int format);
protected:
void SendModifEvent();
- BOOL IsLinkPos(FPOINT pos);
+ bool IsLinkPos(FPOINT pos);
void MouseDoubleClick(FPOINT mouse);
void MouseClick(FPOINT mouse);
void MouseMove(FPOINT mouse);
@@ -169,7 +169,7 @@ protected: void MoveAdjust();
void HyperJump(char *name, char *marker);
- BOOL HyperAdd(char *filename, int firstLine);
+ bool HyperAdd(char *filename, int firstLine);
void DrawImage(FPOINT pos, char *name, float width, float offset, float height, int nbLine);
void DrawBack(FPOINT pos, FPOINT dim);
@@ -177,12 +177,12 @@ protected: void FreeImage();
void LoadImage(char *name);
- void Scroll(int pos, BOOL bAdjustCursor);
+ void Scroll(int pos, bool bAdjustCursor);
void Scroll();
- void MoveChar(int move, BOOL bWord, BOOL bSelect);
- void MoveLine(int move, BOOL bWord, BOOL bSelect);
- void MoveHome(BOOL bWord, BOOL bSelect);
- void MoveEnd(BOOL bWord, BOOL bSelect);
+ void MoveChar(int move, bool bWord, bool bSelect);
+ void MoveLine(int move, bool bWord, bool bSelect);
+ void MoveHome(bool bWord, bool bSelect);
+ void MoveEnd(bool bWord, bool bSelect);
void ColumnFix();
void Insert(char character);
void InsertOne(char character);
@@ -191,14 +191,14 @@ protected: int IndentCompute();
int IndentTabCount();
void IndentTabAdjust(int number);
- BOOL Shift(BOOL bLeft);
- BOOL MinMaj(BOOL bMaj);
+ bool Shift(bool bLeft);
+ bool MinMaj(bool bMaj);
void Justif();
int RetCursorLine(int cursor);
void UndoFlush();
void UndoMemorize(OperUndo oper);
- BOOL UndoRecall();
+ bool UndoRecall();
protected:
CScroll* m_scroll; // vertical scrollbar on the right
@@ -210,15 +210,15 @@ protected: int m_cursor1; // offset cursor
int m_cursor2; // offset cursor
- BOOL m_bMulti; // TRUE -> multi-line
- BOOL m_bEdit; // TRUE -> editable
- BOOL m_bHilite; // TRUE -> hilitable
- BOOL m_bInsideScroll; // TRUE -> lift as part
- BOOL m_bDisplaySpec; // TRUE -> displays the special characters
- BOOL m_bMultiFont; // TRUE -> more fonts possible
- BOOL m_bSoluce; // TRUE -> shows the links-solution
- BOOL m_bGeneric; // TRUE -> generic that defile
- BOOL m_bAutoIndent; // TRUE -> automatic indentation
+ bool m_bMulti; // true -> multi-line
+ bool m_bEdit; // true -> editable
+ bool m_bHilite; // true -> hilitable
+ bool m_bInsideScroll; // true -> lift as part
+ bool m_bDisplaySpec; // true -> displays the special characters
+ bool m_bMultiFont; // true -> more fonts possible
+ bool m_bSoluce; // true -> shows the links-solution
+ bool m_bGeneric; // true -> generic that defile
+ bool m_bAutoIndent; // true -> automatic indentation
float m_lineHeight; // height of a row
float m_lineAscent; // height above the baseline
float m_lineDescent; // height below the baseline
@@ -243,9 +243,9 @@ protected: FPOINT m_mouseLastPos;
float m_column;
- BOOL m_bCapture;
+ bool m_bCapture;
- BOOL m_bUndoForce;
+ bool m_bUndoForce;
OperUndo m_undoOper;
EditUndo m_undo[EDITUNDOMAX];
};
diff --git a/src/ui/editvalue.cpp b/src/ui/editvalue.cpp index 39e5b29..dfbd65a 100644 --- a/src/ui/editvalue.cpp +++ b/src/ui/editvalue.cpp @@ -62,7 +62,7 @@ CEditValue::~CEditValue() // Creates a new button.
-BOOL CEditValue::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CEditValue::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
CEdit* pe;
CButton* pc;
@@ -80,15 +80,15 @@ BOOL CEditValue::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) m_buttonUp = new CButton(m_iMan);
pc = (CButton*)m_buttonUp;
pc->Create(pos, dim, 49, EVENT_NULL); // ^
- pc->SetRepeat(TRUE);
+ pc->SetRepeat(true);
m_buttonDown = new CButton(m_iMan);
pc = (CButton*)m_buttonDown;
pc->Create(pos, dim, 50, EVENT_NULL); // v
- pc->SetRepeat(TRUE);
+ pc->SetRepeat(true);
MoveAdjust();
- return TRUE;
+ return true;
}
@@ -142,14 +142,14 @@ void CEditValue::MoveAdjust() // Management of an event.
-BOOL CEditValue::EventProcess(const Event &event)
+bool CEditValue::EventProcess(const Event &event)
{
float value;
CControl::EventProcess(event);
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
- if ( (m_state & STATE_ENABLE) == 0 ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
+ if ( (m_state & STATE_ENABLE) == 0 ) return true;
if ( m_edit != 0 )
{
@@ -160,10 +160,10 @@ BOOL CEditValue::EventProcess(const Event &event) value = RetValue();
if ( value > m_maxValue ) value = m_maxValue;
if ( value < m_minValue ) value = m_minValue;
- SetValue(value, TRUE);
+ SetValue(value, true);
HiliteValue(event);
}
- if ( !m_edit->EventProcess(event) ) return FALSE;
+ if ( !m_edit->EventProcess(event) ) return false;
if ( event.event == m_edit->RetEventMsg() )
{
@@ -179,10 +179,10 @@ BOOL CEditValue::EventProcess(const Event &event) {
value = RetValue()+m_stepValue;
if ( value > m_maxValue ) value = m_maxValue;
- SetValue(value, TRUE);
+ SetValue(value, true);
HiliteValue(event);
}
- if ( !m_buttonUp->EventProcess(event) ) return FALSE;
+ if ( !m_buttonUp->EventProcess(event) ) return false;
}
if ( m_buttonDown != 0 )
@@ -191,10 +191,10 @@ BOOL CEditValue::EventProcess(const Event &event) {
value = RetValue()-m_stepValue;
if ( value < m_minValue ) value = m_minValue;
- SetValue(value, TRUE);
+ SetValue(value, true);
HiliteValue(event);
}
- if ( !m_buttonDown->EventProcess(event) ) return FALSE;
+ if ( !m_buttonDown->EventProcess(event) ) return false;
}
if ( event.event == EVENT_KEYDOWN &&
@@ -203,7 +203,7 @@ BOOL CEditValue::EventProcess(const Event &event) {
value = RetValue()+m_stepValue;
if ( value > m_maxValue ) value = m_maxValue;
- SetValue(value, TRUE);
+ SetValue(value, true);
HiliteValue(event);
}
if ( event.event == EVENT_KEYDOWN &&
@@ -212,11 +212,11 @@ BOOL CEditValue::EventProcess(const Event &event) {
value = RetValue()-m_stepValue;
if ( value < m_minValue ) value = m_minValue;
- SetValue(value, TRUE);
+ SetValue(value, true);
HiliteValue(event);
}
- return TRUE;
+ return true;
}
@@ -235,7 +235,7 @@ void CEditValue::HiliteValue(const Event &event) }
m_edit->SetCursor(pos, 0);
- m_edit->SetFocus(TRUE);
+ m_edit->SetFocus(true);
Event newEvent = event;
newEvent.event = EVENT_FOCUS;
@@ -285,7 +285,7 @@ EditValueType CEditValue::RetType() // Changes the value.
-void CEditValue::SetValue(float value, BOOL bSendMessage)
+void CEditValue::SetValue(float value, bool bSendMessage)
{
char text[100];
diff --git a/src/ui/editvalue.h b/src/ui/editvalue.h index e6c16f9..a05224f 100644 --- a/src/ui/editvalue.h +++ b/src/ui/editvalue.h @@ -42,18 +42,18 @@ public: CEditValue(CInstanceManager* iMan);
virtual ~CEditValue();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
void SetPos(FPOINT pos);
void SetDim(FPOINT dim);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
void SetType(EditValueType type);
EditValueType RetType();
- void SetValue(float value, BOOL bSendMessage=FALSE);
+ void SetValue(float value, bool bSendMessage=false);
float RetValue();
void SetStepValue(float value);
diff --git a/src/ui/gauge.cpp b/src/ui/gauge.cpp index b01230c..b7a1b1a 100644 --- a/src/ui/gauge.cpp +++ b/src/ui/gauge.cpp @@ -50,18 +50,18 @@ CGauge::~CGauge() // Creates a new button.
-BOOL CGauge::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CGauge::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CGauge::EventProcess(const Event &event)
+bool CGauge::EventProcess(const Event &event)
{
CControl::EventProcess(event);
@@ -72,11 +72,11 @@ BOOL CGauge::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
diff --git a/src/ui/gauge.h b/src/ui/gauge.h index e4ec692..2fef15b 100644 --- a/src/ui/gauge.h +++ b/src/ui/gauge.h @@ -32,9 +32,9 @@ public: CGauge(CInstanceManager* iMan);
virtual ~CGauge();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
diff --git a/src/ui/group.cpp b/src/ui/group.cpp index 73f8b36..a19e39b 100644 --- a/src/ui/group.cpp +++ b/src/ui/group.cpp @@ -50,7 +50,7 @@ CGroup::~CGroup() // Creates a new button.
-BOOL CGroup::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CGroup::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
@@ -67,15 +67,15 @@ BOOL CGroup::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) SetName(name);
}
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CGroup::EventProcess(const Event &event)
+bool CGroup::EventProcess(const Event &event)
{
- return TRUE;
+ return true;
}
diff --git a/src/ui/group.h b/src/ui/group.h index 9cefeed..264ae54 100644 --- a/src/ui/group.h +++ b/src/ui/group.h @@ -32,9 +32,9 @@ public: CGroup(CInstanceManager* iMan);
virtual ~CGroup();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
diff --git a/src/ui/image.cpp b/src/ui/image.cpp index 39ff867..f229585 100644 --- a/src/ui/image.cpp +++ b/src/ui/image.cpp @@ -55,7 +55,7 @@ CImage::~CImage() // Creates a new button.
-BOOL CImage::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CImage::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
@@ -72,7 +72,7 @@ BOOL CImage::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) SetName(name);
}
- return TRUE;
+ return true;
}
@@ -96,9 +96,9 @@ char* CImage::RetFilenameImage() // Management of an event.
-BOOL CImage::EventProcess(const Event &event)
+bool CImage::EventProcess(const Event &event)
{
- return TRUE;
+ return true;
}
diff --git a/src/ui/image.h b/src/ui/image.h index b1f9bdc..9d2aa29 100644 --- a/src/ui/image.h +++ b/src/ui/image.h @@ -32,9 +32,9 @@ public: CImage(CInstanceManager* iMan);
virtual ~CImage();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 75afd27..99b4755 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -489,7 +489,7 @@ CMap* CInterface::CreateMap(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) // Removes a control.
-BOOL CInterface::DeleteControl(EventMsg eventMsg)
+bool CInterface::DeleteControl(EventMsg eventMsg)
{
int i;
@@ -501,11 +501,11 @@ BOOL CInterface::DeleteControl(EventMsg eventMsg) {
delete m_table[i];
m_table[i] = 0;
- return TRUE;
+ return true;
}
}
}
- return FALSE;
+ return false;
}
// Gives a control.
@@ -529,7 +529,7 @@ CControl* CInterface::SearchControl(EventMsg eventMsg) // Management of an event.
-BOOL CInterface::EventProcess(const Event &event)
+bool CInterface::EventProcess(const Event &event)
{
int i;
@@ -549,18 +549,18 @@ BOOL CInterface::EventProcess(const Event &event) {
if ( !m_table[i]->EventProcess(event) )
{
- return FALSE;
+ return false;
}
}
}
- return TRUE;
+ return true;
}
// Gives the tooltip binding to the window.
-BOOL CInterface::GetTooltip(FPOINT pos, char* name)
+bool CInterface::GetTooltip(FPOINT pos, char* name)
{
int i;
@@ -570,11 +570,11 @@ BOOL CInterface::GetTooltip(FPOINT pos, char* name) {
if ( m_table[i]->GetTooltip(pos, name) )
{
- return TRUE;
+ return true;
}
}
}
- return FALSE;
+ return false;
}
diff --git a/src/ui/interface.h b/src/ui/interface.h index 6ef4c56..45435c0 100644 --- a/src/ui/interface.h +++ b/src/ui/interface.h @@ -52,8 +52,8 @@ public: CInterface(CInstanceManager* iMan);
~CInterface();
- BOOL EventProcess(const Event &event);
- BOOL GetTooltip(FPOINT pos, char* name);
+ bool EventProcess(const Event &event);
+ bool GetTooltip(FPOINT pos, char* name);
void Flush();
CWindow* CreateWindows(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
@@ -73,7 +73,7 @@ public: CCompass* CreateCompass(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
CTarget* CreateTarget(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
CMap* CreateMap(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL DeleteControl(EventMsg eventMsg);
+ bool DeleteControl(EventMsg eventMsg);
CControl* SearchControl(EventMsg eventMsg);
void Draw();
diff --git a/src/ui/key.cpp b/src/ui/key.cpp index 8a68439..d996244 100644 --- a/src/ui/key.cpp +++ b/src/ui/key.cpp @@ -66,7 +66,7 @@ CKey::CKey(CInstanceManager* iMan) : CControl(iMan) {
m_key[0] = 0;
m_key[1] = 0;
- m_bCatch = FALSE;
+ m_bCatch = false;
}
// Object's destructor.
@@ -78,7 +78,7 @@ CKey::~CKey() // Creates a new button.
-BOOL CKey::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CKey::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
char name[100];
char* p;
@@ -92,15 +92,15 @@ BOOL CKey::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) if ( p != 0 ) *p = 0;
SetName(name);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CKey::EventProcess(const Event &event)
+bool CKey::EventProcess(const Event &event)
{
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( m_state & STATE_DEAD ) return true;
CControl::EventProcess(event);
@@ -108,17 +108,17 @@ BOOL CKey::EventProcess(const Event &event) {
if ( Detect(event.pos) )
{
- m_bCatch = TRUE;
+ m_bCatch = true;
}
else
{
- m_bCatch = FALSE;
+ m_bCatch = false;
}
}
if ( event.event == EVENT_KEYDOWN && m_bCatch )
{
- m_bCatch = FALSE;
+ m_bCatch = false;
if ( TestKey(event.param) ) // impossible ?
{
@@ -143,21 +143,21 @@ BOOL CKey::EventProcess(const Event &event) newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
}
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
// Seeks when a key is already used.
-BOOL CKey::TestKey(int key)
+bool CKey::TestKey(int key)
{
int i, j;
if ( key == VK_PAUSE ||
- key == VK_SNAPSHOT ) return TRUE; // blocked key
+ key == VK_SNAPSHOT ) return true; // blocked key
for ( i=0 ; i<20 ; i++ )
{
@@ -176,7 +176,7 @@ BOOL CKey::TestKey(int key) }
}
- return FALSE; // not used
+ return false; // not used
}
diff --git a/src/ui/key.h b/src/ui/key.h index bda1a3d..c3f46fd 100644 --- a/src/ui/key.h +++ b/src/ui/key.h @@ -32,9 +32,9 @@ public: CKey(CInstanceManager* iMan);
virtual ~CKey();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
@@ -42,11 +42,11 @@ public: int RetKey(int option);
protected:
- BOOL TestKey(int key);
+ bool TestKey(int key);
protected:
int m_key[2];
- BOOL m_bCatch;
+ bool m_bCatch;
};
diff --git a/src/ui/label.cpp b/src/ui/label.cpp index 977c7f3..288631c 100644 --- a/src/ui/label.cpp +++ b/src/ui/label.cpp @@ -50,21 +50,21 @@ CLabel::~CLabel() // Creates a new button.
-BOOL CLabel::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CLabel::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CLabel::EventProcess(const Event &event)
+bool CLabel::EventProcess(const Event &event)
{
//? CControl::EventProcess(event);
- return TRUE;
+ return true;
}
diff --git a/src/ui/label.h b/src/ui/label.h index 5ad4eb1..1594deb 100644 --- a/src/ui/label.h +++ b/src/ui/label.h @@ -32,9 +32,9 @@ public: CLabel(CInstanceManager* iMan);
virtual ~CLabel();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
diff --git a/src/ui/list.cpp b/src/ui/list.cpp index 4950cf1..c23aef9 100644 --- a/src/ui/list.cpp +++ b/src/ui/list.cpp @@ -55,8 +55,8 @@ CList::CList(CInstanceManager* iMan) : CControl(iMan) for ( i=0 ; i<LISTMAXTOTAL ; i++ )
{
m_text[i][0] = 0;
- m_check[i] = FALSE;
- m_enable[i] = TRUE;
+ m_check[i] = false;
+ m_enable[i] = true;
}
for ( i=0 ; i<10 ; i++ )
@@ -69,8 +69,8 @@ CList::CList(CInstanceManager* iMan) : CControl(iMan) m_displayLine = 0;
m_selectLine = -1;
m_firstLine = 0;
- m_bBlink = FALSE;
- m_bSelectCap = TRUE;
+ m_bBlink = false;
+ m_bSelectCap = true;
m_blinkTime = 0.0f;
}
@@ -90,7 +90,7 @@ CList::~CList() // Creates a new list.
-BOOL CList::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg,
+bool CList::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg,
float expand)
{
m_expand = expand;
@@ -107,7 +107,7 @@ BOOL CList::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg, // Adjusted after a change of dimensions.
-BOOL CList::MoveAdjust()
+bool CList::MoveAdjust()
{
FPOINT ipos, idim, ppos, ddim;
float marging, h;
@@ -130,7 +130,7 @@ BOOL CList::MoveAdjust() h = m_engine->RetText()->RetHeight(m_fontSize, m_fontType)*m_expand;
m_displayLine = (int)(idim.y/h);
- if ( m_displayLine == 0 ) return FALSE;
+ if ( m_displayLine == 0 ) return false;
if ( m_displayLine > LISTMAXDISPLAY ) m_displayLine = LISTMAXDISPLAY;
idim.y = h*m_displayLine;
m_dim.y = idim.y+marging*2.0f/480.f;
@@ -164,7 +164,7 @@ BOOL CList::MoveAdjust() UpdateScroll();
UpdateButton();
- return TRUE;
+ return true;
}
@@ -199,7 +199,7 @@ void CList::SetDim(FPOINT dim) }
-BOOL CList::SetState(int state, BOOL bState)
+bool CList::SetState(int state, bool bState)
{
int i;
@@ -215,7 +215,7 @@ BOOL CList::SetState(int state, BOOL bState) return CControl::SetState(state, bState);
}
-BOOL CList::SetState(int state)
+bool CList::SetState(int state)
{
int i;
@@ -231,7 +231,7 @@ BOOL CList::SetState(int state) return CControl::SetState(state);
}
-BOOL CList::ClearState(int state)
+bool CList::ClearState(int state)
{
int i;
@@ -250,7 +250,7 @@ BOOL CList::ClearState(int state) // Management of an event.
-BOOL CList::EventProcess(const Event &event)
+bool CList::EventProcess(const Event &event)
{
int i;
@@ -276,8 +276,8 @@ BOOL CList::EventProcess(const Event &event) }
}
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
- if ( (m_state & STATE_ENABLE) == 0 ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
+ if ( (m_state & STATE_ENABLE) == 0 ) return true;
if ( event.event == EVENT_KEYDOWN &&
event.param == VK_WHEELUP &&
@@ -286,7 +286,7 @@ BOOL CList::EventProcess(const Event &event) if ( m_firstLine > 0 ) m_firstLine --;
UpdateScroll();
UpdateButton();
- return TRUE;
+ return true;
}
if ( event.event == EVENT_KEYDOWN &&
event.param == VK_WHEELDOWN &&
@@ -295,7 +295,7 @@ BOOL CList::EventProcess(const Event &event) if ( m_firstLine < m_totalLine-m_displayLine ) m_firstLine ++;
UpdateScroll();
UpdateButton();
- return TRUE;
+ return true;
}
CControl::EventProcess(event);
@@ -320,7 +320,7 @@ BOOL CList::EventProcess(const Event &event) if ( i+m_firstLine >= m_totalLine ) break;
if ( m_button[i] != 0 )
{
- if ( !m_button[i]->EventProcess(event) ) return FALSE;
+ if ( !m_button[i]->EventProcess(event) ) return false;
if ( event.event == m_eventButton[i] )
{
@@ -336,7 +336,7 @@ BOOL CList::EventProcess(const Event &event) if ( m_scroll != 0 )
{
- if ( !m_scroll->EventProcess(event) ) return FALSE;
+ if ( !m_scroll->EventProcess(event) ) return false;
if ( event.event == m_eventScroll )
{
@@ -345,7 +345,7 @@ BOOL CList::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -635,12 +635,12 @@ int CList::RetSelect() // Management of capability has a select box.
-void CList::SetSelectCap(BOOL bEnable)
+void CList::SetSelectCap(bool bEnable)
{
m_bSelectCap = bEnable;
}
-BOOL CList::RetSelectCap()
+bool CList::RetSelectCap()
{
return m_bSelectCap;
}
@@ -648,7 +648,7 @@ BOOL CList::RetSelectCap() // Blink a line.
-void CList::SetBlink(BOOL bEnable)
+void CList::SetBlink(bool bEnable)
{
int i;
@@ -668,7 +668,7 @@ void CList::SetBlink(BOOL bEnable) }
}
-BOOL CList::RetBlink()
+bool CList::RetBlink()
{
return m_bBlink;
}
@@ -709,7 +709,7 @@ char* CList::RetName(int i) // Specifies the bit "check" for a box.
-void CList::SetCheck(int i, BOOL bMode)
+void CList::SetCheck(int i, bool bMode)
{
if ( i < 0 || i >= m_totalLine ) return;
@@ -718,9 +718,9 @@ void CList::SetCheck(int i, BOOL bMode) // Returns the bit "check" for a box.
-BOOL CList::RetCheck(int i)
+bool CList::RetCheck(int i)
{
- if ( i < 0 || i >= m_totalLine ) return FALSE;
+ if ( i < 0 || i >= m_totalLine ) return false;
return m_check[i];
}
@@ -728,7 +728,7 @@ BOOL CList::RetCheck(int i) // Specifies the bit "enable" for a box.
-void CList::SetEnable(int i, BOOL bMode)
+void CList::SetEnable(int i, bool bMode)
{
if ( i < 0 || i >= m_totalLine ) return;
@@ -737,9 +737,9 @@ void CList::SetEnable(int i, BOOL bMode) // Returns the bit "enable" for a box.
-BOOL CList::RetEnable(int i)
+bool CList::RetEnable(int i)
{
- if ( i < 0 || i >= m_totalLine ) return FALSE;
+ if ( i < 0 || i >= m_totalLine ) return false;
return m_enable[i];
}
@@ -763,7 +763,7 @@ float CList::RetTabs(int i) // Moves the lift to see the list of the selected line.
-void CList::ShowSelect(BOOL bFixed)
+void CList::ShowSelect(bool bFixed)
{
int sel;
diff --git a/src/ui/list.h b/src/ui/list.h index 0a648a3..82fd470 100644 --- a/src/ui/list.h +++ b/src/ui/list.h @@ -39,16 +39,16 @@ public: CList(CInstanceManager* iMan);
~CList();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg, float expand);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg, float expand);
void SetPos(FPOINT pos);
void SetDim(FPOINT dim);
- BOOL SetState(int state, BOOL bState);
- BOOL SetState(int state);
- BOOL ClearState(int state);
+ bool SetState(int state, bool bState);
+ bool SetState(int state);
+ bool ClearState(int state);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
void Flush();
@@ -59,31 +59,31 @@ public: void SetSelect(int i);
int RetSelect();
- void SetSelectCap(BOOL bEnable);
- BOOL RetSelectCap();
+ void SetSelectCap(bool bEnable);
+ bool RetSelectCap();
- void SetBlink(BOOL bEnable);
- BOOL RetBlink();
+ void SetBlink(bool bEnable);
+ bool RetBlink();
void SetName(int i, char* name);
char* RetName(int i);
- void SetCheck(int i, BOOL bMode);
- BOOL RetCheck(int i);
+ void SetCheck(int i, bool bMode);
+ bool RetCheck(int i);
- void SetEnable(int i, BOOL bEnable);
- BOOL RetEnable(int i);
+ void SetEnable(int i, bool bEnable);
+ bool RetEnable(int i);
void SetTabs(int i, float pos, int justif=1);
float RetTabs(int i);
- void ShowSelect(BOOL bFixed);
+ void ShowSelect(bool bFixed);
EventMsg RetEventMsgButton(int i);
EventMsg RetEventMsgScroll();
protected:
- BOOL MoveAdjust();
+ bool MoveAdjust();
void UpdateButton();
void UpdateScroll();
void MoveScroll();
@@ -101,8 +101,8 @@ protected: int m_displayLine; // number of visible lines
int m_selectLine; // selected line
int m_firstLine; // first visible line
- BOOL m_bBlink;
- BOOL m_bSelectCap;
+ bool m_bBlink;
+ bool m_bSelectCap;
float m_blinkTime;
float m_tabs[10];
int m_justifs[10];
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index eb5640e..40ac4c9 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -114,7 +114,7 @@ static int perso_color[3*10*3] = #if _NET
// Check if the key "school" is present in the registry.
-BOOL SchoolCheck()
+bool SchoolCheck()
{
HKEY key;
char buffer[100];
@@ -128,16 +128,16 @@ BOOL SchoolCheck() "Software\\Epsitec\\Colobot\\Setup",
#endif
0, KEY_READ, &key);
- if ( i != ERROR_SUCCESS ) return FALSE;
+ if ( i != ERROR_SUCCESS ) return false;
type = REG_SZ;
len = sizeof(buffer);
i = RegQueryValueEx(key, "School", NULL, &type, (LPBYTE)buffer, &len);
- if ( i != ERROR_SUCCESS || type != REG_SZ ) return FALSE;
+ if ( i != ERROR_SUCCESS || type != REG_SZ ) return false;
- if ( strcmp(buffer, "ToBoLoC") != 0 ) return FALSE;
+ if ( strcmp(buffer, "ToBoLoC") != 0 ) return false;
- return TRUE;
+ return true;
}
#endif
@@ -166,18 +166,18 @@ CMainDialog::CMainDialog(CInstanceManager* iMan) m_stackRead[0] = 0;
m_sceneName[0] = 0;
m_sceneRank = 0;
- m_bSceneSoluce = FALSE;
- m_bSimulSetup = FALSE;
+ m_bSceneSoluce = false;
+ m_bSimulSetup = false;
#if _NET
m_accessEnable = SchoolCheck();
- m_accessMission= FALSE;
- m_accessUser = FALSE;
+ m_accessMission= false;
+ m_accessUser = false;
#else
- m_accessEnable = TRUE;
- m_accessMission= TRUE;
- m_accessUser = TRUE;
+ m_accessEnable = true;
+ m_accessMission= true;
+ m_accessUser = true;
#endif
- m_bDeleteGamer = TRUE;
+ m_bDeleteGamer = true;
for ( i=0 ; i<10 ; i++ )
{
@@ -190,21 +190,21 @@ CMainDialog::CMainDialog(CInstanceManager* iMan) ZeroMemory(&m_perso, sizeof(GamerPerso));
DefPerso();
- m_bTooltip = TRUE;
- m_bGlint = TRUE;
- m_bRain = TRUE;
- m_bSoluce4 = TRUE;
- m_bMovies = TRUE;
- m_bNiceReset = TRUE;
- m_bHimselfDamage = TRUE;
+ m_bTooltip = true;
+ m_bGlint = true;
+ m_bRain = true;
+ m_bSoluce4 = true;
+ m_bMovies = true;
+ m_bNiceReset = true;
+ m_bHimselfDamage = true;
#if _TEEN
- m_bCameraScroll = FALSE;
+ m_bCameraScroll = false;
#else
- m_bCameraScroll = TRUE;
+ m_bCameraScroll = true;
#endif
- m_bCameraInvertX = FALSE;
- m_bCameraInvertY = FALSE;
- m_bEffect = TRUE;
+ m_bCameraInvertX = false;
+ m_bCameraInvertY = false;
+ m_bEffect = true;
m_shotDelay = 0;
m_glintMouse = FPOINT(0.0f, 0.0f);
@@ -222,7 +222,7 @@ CMainDialog::CMainDialog(CInstanceManager* iMan) strcpy(m_userDir, "user");
strcpy(m_filesDir, "files");
- m_bDialog = FALSE;
+ m_bDialog = false;
}
// Destructor of robot application.
@@ -255,7 +255,7 @@ void CMainDialog::ChangePhase(Phase phase) int res, i, j;
m_camera->SetType(CAMERA_DIALOG);
- m_engine->SetOverFront(FALSE);
+ m_engine->SetOverFront(false);
m_engine->SetOverColor(RetColor(0.0f), D3DSTATETCb);
if ( phase == PHASE_TERM )
@@ -434,8 +434,8 @@ void CMainDialog::ChangePhase(Phase phase) pl->SetFontType(FONT_COURIER);
pl->SetFontSize(8.0f);
- m_engine->SetBackground("inter01.tga", 0,0, 0,0, TRUE, TRUE);
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true);
+ m_engine->SetBackForce(true);
}
if ( m_phase == PHASE_NAME )
@@ -504,7 +504,7 @@ void CMainDialog::ChangePhase(Phase phase) }
pe->SetText(name);
pe->SetCursor(strlen(name), 0);
- pe->SetFocus(TRUE);
+ pe->SetFocus(true);
pos.x = 380.0f/640.0f;
pos.y = 320.0f/480.0f;
@@ -551,8 +551,8 @@ void CMainDialog::ChangePhase(Phase phase) UpdateNameControl();
UpdateNameFace();
- m_engine->SetBackground("inter01.tga", 0,0, 0,0, TRUE, TRUE);
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true);
+ m_engine->SetBackForce(true);
}
if ( m_phase == PHASE_PERSO )
@@ -747,7 +747,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 20.0f/480.0f;
pb = pw->CreateButton(pos, ddim, 55, EVENT_INTERFACE_PLROT); // <
pb->SetState(STATE_SHADOW);
- pb->SetRepeat(TRUE);
+ pb->SetRepeat(true);
pos.x = 290.0f/640.0f;
pos.y = 113.0f/480.0f;
@@ -755,7 +755,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 20.0f/480.0f;
pb = pw->CreateButton(pos, ddim, 48, EVENT_INTERFACE_PRROT); // >
pb->SetState(STATE_SHADOW);
- pb->SetRepeat(TRUE);
+ pb->SetRepeat(true);
pos.x = 100.0f/640.0f;
pos.y = 70.0f/480.0f;
@@ -824,7 +824,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.80f;
ddim.y = 0.80f;
pw = m_interface->CreateWindows(pos, ddim, 12, EVENT_WINDOW5);
- pw->SetClosable(TRUE);
+ pw->SetClosable(true);
if ( m_phase == PHASE_TRAINER ) res = RT_TITLE_TRAINER;
if ( m_phase == PHASE_DEFI ) res = RT_TITLE_DEFI;
if ( m_phase == PHASE_MISSION ) res = RT_TITLE_MISSION;
@@ -935,8 +935,8 @@ void CMainDialog::ChangePhase(Phase phase) pe = pw->CreateEdit(pos, ddim, 0, EVENT_INTERFACE_RESUME);
pe->SetState(STATE_SHADOW);
pe->SetMaxChar(500);
- pe->SetEditCap(FALSE); // just to see
- pe->SetHiliteCap(FALSE);
+ pe->SetEditCap(false); // just to see
+ pe->SetHiliteCap(false);
// Button displays the "soluce":
if ( m_phase != PHASE_TRAINER &&
@@ -951,7 +951,7 @@ void CMainDialog::ChangePhase(Phase phase) pc->SetState(STATE_SHADOW);
pc->ClearState(STATE_CHECK);
}
- m_bSceneSoluce = FALSE;
+ m_bSceneSoluce = false;
UpdateSceneResume((m_chap[m_index]+1)*100+(m_sel[m_index]+1));
@@ -998,8 +998,8 @@ void CMainDialog::ChangePhase(Phase phase) pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_BACK);
pb->SetState(STATE_SHADOW);
- m_engine->SetBackground("inter01.tga", 0,0, 0,0, TRUE, TRUE);
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true);
+ m_engine->SetBackForce(true);
}
if ( m_phase == PHASE_SETUPd ||
@@ -1016,32 +1016,32 @@ void CMainDialog::ChangePhase(Phase phase) if ( m_phase == PHASE_SETUPds )
{
m_phaseSetup = PHASE_SETUPd;
- m_bSimulSetup = TRUE;
+ m_bSimulSetup = true;
}
else if ( m_phase == PHASE_SETUPgs )
{
m_phaseSetup = PHASE_SETUPg;
- m_bSimulSetup = TRUE;
+ m_bSimulSetup = true;
}
else if ( m_phase == PHASE_SETUPps )
{
m_phaseSetup = PHASE_SETUPp;
- m_bSimulSetup = TRUE;
+ m_bSimulSetup = true;
}
else if ( m_phase == PHASE_SETUPcs )
{
m_phaseSetup = PHASE_SETUPc;
- m_bSimulSetup = TRUE;
+ m_bSimulSetup = true;
}
else if ( m_phase == PHASE_SETUPss )
{
m_phaseSetup = PHASE_SETUPs;
- m_bSimulSetup = TRUE;
+ m_bSimulSetup = true;
}
else
{
m_phaseSetup = m_phase;
- m_bSimulSetup = FALSE;
+ m_bSimulSetup = false;
}
pos.x = 0.10f;
@@ -1049,7 +1049,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.80f;
ddim.y = 0.80f;
pw = m_interface->CreateWindows(pos, ddim, 12, EVENT_WINDOW5);
- pw->SetClosable(TRUE);
+ pw->SetClosable(true);
GetResource(RES_TEXT, RT_TITLE_SETUP, name);
pw->SetName(name);
@@ -1192,8 +1192,8 @@ void CMainDialog::ChangePhase(Phase phase) if ( !m_bSimulSetup )
{
- m_engine->SetBackground("inter01.tga", 0,0, 0,0, TRUE, TRUE);
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true);
+ m_engine->SetBackForce(true);
}
}
@@ -1576,7 +1576,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.80f;
ddim.y = 0.80f;
pw = m_interface->CreateWindows(pos, ddim, 13, EVENT_WINDOW5);
- pw->SetClosable(TRUE);
+ pw->SetClosable(true);
GetResource(RES_TEXT, RT_TITLE_WRITE, name);
pw->SetName(name);
@@ -1660,7 +1660,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.80f;
ddim.y = 0.80f;
pw = m_interface->CreateWindows(pos, ddim, 14, EVENT_WINDOW5);
- pw->SetClosable(TRUE);
+ pw->SetClosable(true);
GetResource(RES_TEXT, RT_TITLE_READ, name);
pw->SetName(name);
@@ -1727,8 +1727,8 @@ void CMainDialog::ChangePhase(Phase phase) if ( m_phase == PHASE_READ )
{
- m_engine->SetBackground("inter01.tga", 0,0, 0,0, TRUE, TRUE);
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true);
+ m_engine->SetBackForce(true);
}
}
@@ -1772,8 +1772,8 @@ void CMainDialog::ChangePhase(Phase phase) pl->SetFontSize(12.0f);
pl->SetJustif(0);
- m_engine->SetBackground("inter01.tga", 0,0, 0,0, TRUE, TRUE);
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true);
+ m_engine->SetBackForce(true);
m_loadingCounter = 1; // enough time to display!
}
@@ -1781,7 +1781,7 @@ void CMainDialog::ChangePhase(Phase phase) if ( m_phase == PHASE_WELCOME1 )
{
m_sound->StopMusic();
- m_sound->PlayMusic(11, FALSE);
+ m_sound->PlayMusic(11, false);
pos.x = 0.0f;
pos.y = 0.0f;
@@ -1790,28 +1790,28 @@ void CMainDialog::ChangePhase(Phase phase) pw = m_interface->CreateWindows(pos, ddim, -1, EVENT_WINDOW5);
m_engine->SetOverColor(RetColor(1.0f), D3DSTATETCb);
- m_engine->SetOverFront(TRUE);
+ m_engine->SetOverFront(true);
#if _FRENCH
- m_engine->SetBackground("alsyd.tga", 0,0, 0,0, TRUE, FALSE);
+ m_engine->SetBackground("alsyd.tga", 0,0, 0,0, true, false);
#endif
#if _POLISH
- m_engine->SetBackground("manta.tga", 0,0, 0,0, TRUE, FALSE);
+ m_engine->SetBackground("manta.tga", 0,0, 0,0, true, false);
#endif
#if _WG
- m_engine->SetBackground("wg.tga", 0,0, 0,0, TRUE, FALSE);
+ m_engine->SetBackground("wg.tga", 0,0, 0,0, true, false);
#endif
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackForce(true);
}
if ( m_phase == PHASE_WELCOME2 )
{
#if _ENGLISH
m_sound->StopMusic();
- m_sound->PlayMusic(11, FALSE);
+ m_sound->PlayMusic(11, false);
#endif
#if _POLISH
m_sound->StopMusic();
- m_sound->PlayMusic(11, FALSE);
+ m_sound->PlayMusic(11, false);
#endif
pos.x = 0.0f;
@@ -1821,10 +1821,10 @@ void CMainDialog::ChangePhase(Phase phase) pw = m_interface->CreateWindows(pos, ddim, -1, EVENT_WINDOW5);
m_engine->SetOverColor(RetColor(1.0f), D3DSTATETCb);
- m_engine->SetOverFront(TRUE);
+ m_engine->SetOverFront(true);
- m_engine->SetBackground("colobot.tga", 0,0, 0,0, TRUE, FALSE);
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackground("colobot.tga", 0,0, 0,0, true, false);
+ m_engine->SetBackForce(true);
}
if ( m_phase == PHASE_WELCOME3 )
{
@@ -1835,21 +1835,21 @@ void CMainDialog::ChangePhase(Phase phase) pw = m_interface->CreateWindows(pos, ddim, -1, EVENT_WINDOW5);
m_engine->SetOverColor(RetColor(0.0f), D3DSTATETCw);
- m_engine->SetOverFront(TRUE);
+ m_engine->SetOverFront(true);
#if _FRENCH
- m_engine->SetBackground("epsitecf.tga", 0,0, 0,0, TRUE, FALSE);
+ m_engine->SetBackground("epsitecf.tga", 0,0, 0,0, true, false);
#endif
#if _ENGLISH
- m_engine->SetBackground("epsitece.tga", 0,0, 0,0, TRUE, FALSE);
+ m_engine->SetBackground("epsitece.tga", 0,0, 0,0, true, false);
#endif
#if _GERMAN | _WG
- m_engine->SetBackground("epsitecd.tga", 0,0, 0,0, TRUE, FALSE);
+ m_engine->SetBackground("epsitecd.tga", 0,0, 0,0, true, false);
#endif
#if _POLISH
- m_engine->SetBackground("epsitecp.tga", 0,0, 0,0, TRUE, FALSE);
+ m_engine->SetBackground("epsitecp.tga", 0,0, 0,0, true, false);
#endif
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackForce(true);
}
if ( m_phase == PHASE_GENERIC )
@@ -1866,9 +1866,9 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 490.0f/640.0f;
ddim.y = 110.0f/480.0f;
pe = pw->CreateEdit(pos, ddim, 0, EVENT_EDIT1);
- pe->SetGenericMode(TRUE);
- pe->SetEditCap(FALSE);
- pe->SetHiliteCap(FALSE);
+ pe->SetGenericMode(true);
+ pe->SetEditCap(false);
+ pe->SetHiliteCap(false);
pe->SetFontType(FONT_COURIER);
pe->SetFontSize(8.0f);
pe->ReadText("help\\authors.txt");
@@ -1878,9 +1878,9 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 490.0f/640.0f;
ddim.y = 100.0f/480.0f;
pe = pw->CreateEdit(pos, ddim, 0, EVENT_EDIT2);
- pe->SetGenericMode(TRUE);
- pe->SetEditCap(FALSE);
- pe->SetHiliteCap(FALSE);
+ pe->SetGenericMode(true);
+ pe->SetEditCap(false);
+ pe->SetHiliteCap(false);
pe->SetFontType(FONT_COURIER);
pe->SetFontSize(6.5f);
pe->ReadText("help\\licences.txt");
@@ -1898,9 +1898,9 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 150.0f/480.0f;
#endif
pe = pw->CreateEdit(pos, ddim, 0, EVENT_EDIT1);
- pe->SetGenericMode(TRUE);
- pe->SetEditCap(FALSE);
- pe->SetHiliteCap(FALSE);
+ pe->SetGenericMode(true);
+ pe->SetEditCap(false);
+ pe->SetHiliteCap(false);
pe->SetFontType(FONT_COURIER);
pe->SetFontSize(8.0f);
pe->ReadText("help\\authors.txt");
@@ -1911,9 +1911,9 @@ void CMainDialog::ChangePhase(Phase phase) //? ddim.x = 490.0f/640.0f;
//? ddim.y = 110.0f/480.0f;
//? pe = pw->CreateEdit(pos, ddim, 0, EVENT_EDIT1);
-//? pe->SetGenericMode(TRUE);
-//? pe->SetEditCap(FALSE);
-//? pe->SetHiliteCap(FALSE);
+//? pe->SetGenericMode(true);
+//? pe->SetEditCap(false);
+//? pe->SetHiliteCap(false);
//? pe->SetFontType(FONT_COURIER);
//? pe->SetFontSize(8.0f);
//? pe->ReadText("help\\demo.txt");
@@ -1923,9 +1923,9 @@ void CMainDialog::ChangePhase(Phase phase) //? ddim.x = 490.0f/640.0f;
//? ddim.y = 100.0f/480.0f;
//? pe = pw->CreateEdit(pos, ddim, 0, EVENT_EDIT2);
-//? pe->SetGenericMode(TRUE);
-//? pe->SetEditCap(FALSE);
-//? pe->SetHiliteCap(FALSE);
+//? pe->SetGenericMode(true);
+//? pe->SetEditCap(false);
+//? pe->SetHiliteCap(false);
//? pe->SetFontType(FONT_COURIER);
//? pe->SetFontSize(8.0f);
//? pe->ReadText("help\\authors.txt");
@@ -1982,51 +1982,51 @@ void CMainDialog::ChangePhase(Phase phase) #if _NEWLOOK
#if _CEEBOTDEMO
#if _TEEN
- m_engine->SetBackground("genedt.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genedt.tga", 0,0, 0,0, true, true);
#else
- m_engine->SetBackground("geneda.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("geneda.tga", 0,0, 0,0, true, true);
#endif
#else
- m_engine->SetBackground("genern.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genern.tga", 0,0, 0,0, true, true);
#endif
#else
#if _FRENCH
#if _DEMO
- m_engine->SetBackground("genedf.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genedf.tga", 0,0, 0,0, true, true);
#else
- m_engine->SetBackground("generf.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("generf.tga", 0,0, 0,0, true, true);
#endif
#endif
#if _ENGLISH
#if _DEMO
- m_engine->SetBackground("genede.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genede.tga", 0,0, 0,0, true, true);
#else
- m_engine->SetBackground("genere.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genere.tga", 0,0, 0,0, true, true);
#endif
#endif
#if _GERMAN
#if _DEMO
- m_engine->SetBackground("genedd.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genedd.tga", 0,0, 0,0, true, true);
#else
- m_engine->SetBackground("genere.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genere.tga", 0,0, 0,0, true, true);
#endif
#endif
#if _WG
#if _DEMO
- m_engine->SetBackground("genedd.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genedd.tga", 0,0, 0,0, true, true);
#else
- m_engine->SetBackground("generd.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("generd.tga", 0,0, 0,0, true, true);
#endif
#endif
#if _POLISH
#if _DEMO
- m_engine->SetBackground("genedp.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("genedp.tga", 0,0, 0,0, true, true);
#else
- m_engine->SetBackground("generp.tga", 0,0, 0,0, TRUE, TRUE);
+ m_engine->SetBackground("generp.tga", 0,0, 0,0, true, true);
#endif
#endif
#endif
- m_engine->SetBackForce(TRUE);
+ m_engine->SetBackForce(true);
}
if ( m_phase == PHASE_INIT ||
@@ -2075,9 +2075,9 @@ void CMainDialog::ChangePhase(Phase phase) // Processing an event.
-// Returns FALSE if the event has been processed completely.
+// Returns false if the event has been processed completely.
-BOOL CMainDialog::EventProcess(const Event &event)
+bool CMainDialog::EventProcess(const Event &event)
{
CWindow* pw;
CList* pl;
@@ -2129,17 +2129,17 @@ BOOL CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_WELCOME1 && m_phaseTime >= welcomeLength )
{
ChangePhase(PHASE_WELCOME2);
- return TRUE;
+ return true;
}
if ( m_phase == PHASE_WELCOME2 && m_phaseTime >= welcomeLength )
{
ChangePhase(PHASE_WELCOME3);
- return TRUE;
+ return true;
}
if ( m_phase == PHASE_WELCOME3 && m_phaseTime >= welcomeLength )
{
ChangePhase(PHASE_NAME);
- return TRUE;
+ return true;
}
if ( m_shotDelay > 0 && !m_bDialog ) // screenshot done?
@@ -2159,7 +2159,7 @@ BOOL CMainDialog::EventProcess(const Event &event) m_main->ChangePhase(PHASE_SIMUL);
}
m_loadingCounter --;
- return FALSE;
+ return false;
}
m_glintTime += event.rTime;
@@ -2172,7 +2172,7 @@ BOOL CMainDialog::EventProcess(const Event &event) FrameDialog(event.rTime);
}
- return TRUE;
+ return true;
}
if ( event.event == EVENT_MOUSEMOVE )
@@ -2244,13 +2244,13 @@ BOOL CMainDialog::EventProcess(const Event &event) ChangePhase(PHASE_READs);
}
- return FALSE;
+ return false;
}
if ( !m_engine->RetMouseHide() &&
!m_interface->EventProcess(event) )
{
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_INIT )
@@ -2308,7 +2308,7 @@ BOOL CMainDialog::EventProcess(const Event &event) m_main->ChangePhase(PHASE_NAME);
break;
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_NAME )
@@ -2498,14 +2498,14 @@ BOOL CMainDialog::EventProcess(const Event &event) m_phase == PHASE_PROTO )
{
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
if ( event.event == pw->RetEventMsgClose() ||
event.event == EVENT_INTERFACE_BACK ||
(event.event == EVENT_KEYDOWN && event.param == VK_ESCAPE) )
{
m_main->ChangePhase(PHASE_INIT);
- return FALSE;
+ return false;
}
}
@@ -2557,7 +2557,7 @@ BOOL CMainDialog::EventProcess(const Event &event) m_main->ChangePhase(PHASE_READ);
break;
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_SETUPd ||
@@ -2567,7 +2567,7 @@ BOOL CMainDialog::EventProcess(const Event &event) m_phase == PHASE_SETUPs )
{
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
if ( event.event == pw->RetEventMsgClose() ||
event.event == EVENT_INTERFACE_BACK ||
@@ -2576,7 +2576,7 @@ BOOL CMainDialog::EventProcess(const Event &event) SetupMemorize();
m_engine->ApplyChange();
m_main->ChangePhase(PHASE_INIT);
- return FALSE;
+ return false;
}
switch( event.event )
@@ -2610,7 +2610,7 @@ BOOL CMainDialog::EventProcess(const Event &event) m_phase == PHASE_SETUPss )
{
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
if ( event.event == pw->RetEventMsgClose() ||
event.event == EVENT_INTERFACE_BACK ||
@@ -2621,7 +2621,7 @@ BOOL CMainDialog::EventProcess(const Event &event) m_interface->DeleteControl(EVENT_WINDOW5);
ChangePhase(PHASE_SIMUL);
StopSuspend();
- return FALSE;
+ return false;
}
switch( event.event )
@@ -2689,7 +2689,7 @@ BOOL CMainDialog::EventProcess(const Event &event) UpdateApply();
break;
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_SETUPg || // setup/graphic ?
@@ -2767,7 +2767,7 @@ BOOL CMainDialog::EventProcess(const Event &event) UpdateSetupButtons();
break;
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_SETUPp || // setup/game ?
@@ -2876,7 +2876,7 @@ BOOL CMainDialog::EventProcess(const Event &event) UpdateSetupButtons();
break;
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_SETUPc || // setup/commands ?
@@ -2924,7 +2924,7 @@ BOOL CMainDialog::EventProcess(const Event &event) UpdateSetupButtons();
break;
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_SETUPs || // setup/sound ?
@@ -2954,13 +2954,13 @@ BOOL CMainDialog::EventProcess(const Event &event) UpdateSetupButtons();
break;
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_READ )
{
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
if ( event.event == pw->RetEventMsgClose() ||
event.event == EVENT_INTERFACE_BACK ||
@@ -2986,14 +2986,14 @@ BOOL CMainDialog::EventProcess(const Event &event) }
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_WRITEs ||
m_phase == PHASE_READs )
{
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
if ( event.event == pw->RetEventMsgClose() ||
event.event == EVENT_INTERFACE_BACK ||
@@ -3031,7 +3031,7 @@ BOOL CMainDialog::EventProcess(const Event &event) }
}
- return FALSE;
+ return false;
}
if ( m_phase == PHASE_WELCOME1 )
@@ -3041,7 +3041,7 @@ BOOL CMainDialog::EventProcess(const Event &event) event.event == EVENT_RBUTTONDOWN )
{
ChangePhase(PHASE_WELCOME2);
- return TRUE;
+ return true;
}
}
if ( m_phase == PHASE_WELCOME2 )
@@ -3051,7 +3051,7 @@ BOOL CMainDialog::EventProcess(const Event &event) event.event == EVENT_RBUTTONDOWN )
{
ChangePhase(PHASE_WELCOME3);
- return TRUE;
+ return true;
}
}
if ( m_phase == PHASE_WELCOME3 )
@@ -3061,7 +3061,7 @@ BOOL CMainDialog::EventProcess(const Event &event) event.event == EVENT_RBUTTONDOWN )
{
ChangePhase(PHASE_NAME);
- return TRUE;
+ return true;
}
}
@@ -3093,7 +3093,7 @@ BOOL CMainDialog::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -3570,7 +3570,7 @@ void CMainDialog::FrameParticule(float rTime) // Some nice particles following the mouse.
-void CMainDialog::NiceParticule(FPOINT mouse, BOOL bPress)
+void CMainDialog::NiceParticule(FPOINT mouse, bool bPress)
{
D3DVECTOR pos, speed;
FPOINT dim;
@@ -3624,11 +3624,11 @@ void CMainDialog::SetUserDir(char *base, int rank) if ( strcmp(base, "user") == 0 && rank >= 100 )
{
sprintf(dir, "%s\\%s", m_userDir, m_userList[rank/100-1]);
- UserDir(TRUE, dir);
+ UserDir(true, dir);
}
else
{
- UserDir(FALSE, "");
+ UserDir(false, "");
}
}
@@ -3669,7 +3669,7 @@ void CMainDialog::ReadNameList() CList* pl;
long hFile;
struct _finddata_t fBuffer;
- BOOL bDo;
+ bool bDo;
char dir[_MAX_FNAME];
char temp[_MAX_FNAME];
char filenames[_MAX_FNAME][100];
@@ -3697,7 +3697,7 @@ void CMainDialog::ReadNameList() }
do // sorts all names:
{
- bDo = FALSE;
+ bDo = false;
for ( i=0 ; i<nbFilenames-1 ; i++ )
{
if ( strcmp(filenames[i], filenames[i+1]) > 0 )
@@ -3705,7 +3705,7 @@ void CMainDialog::ReadNameList() strcpy(temp, filenames[i]);
strcpy(filenames[i], filenames[i+1]);
strcpy(filenames[i+1], temp);
- bDo = TRUE;
+ bDo = true;
}
}
}
@@ -3792,7 +3792,7 @@ void CMainDialog::UpdateNameList() if ( stricmp(name, pl->RetName(i)) == 0 )
{
pl->SetSelect(i);
- pl->ShowSelect(FALSE);
+ pl->ShowSelect(false);
return;
}
}
@@ -3944,7 +3944,7 @@ void CMainDialog::NameCreate() m_sound->Play(SOUND_TZOING);
pe->SetText(name);
pe->SetCursor(strlen(name), 0);
- pe->SetFocus(TRUE);
+ pe->SetFocus(true);
return;
}
@@ -3956,7 +3956,7 @@ void CMainDialog::NameCreate() // Deletes a folder and all its offspring.
-BOOL RemoveDir(char *dirname)
+bool RemoveDir(char *dirname)
{
long hFile;
struct _finddata_t fBuffer;
@@ -3987,9 +3987,9 @@ BOOL RemoveDir(char *dirname) if ( _rmdir(dirname) != 0 )
{
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
// Removes a player.
@@ -4035,7 +4035,7 @@ void CMainDialog::NameDelete() // ests whether two colors are equal or nearly are.
-BOOL EqColor(const D3DCOLORVALUE &c1, const D3DCOLORVALUE &c2)
+bool EqColor(const D3DCOLORVALUE &c1, const D3DCOLORVALUE &c2)
{
return (Abs(c1.r-c2.r) < 0.01f &&
Abs(c1.g-c2.g) < 0.01f &&
@@ -4325,16 +4325,16 @@ void CMainDialog::DefPerso() // Indicates if there is at least one backup.
-BOOL CMainDialog::IsIOReadScene()
+bool CMainDialog::IsIOReadScene()
{
FILE* file;
char filename[100];
sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], 0);
file = fopen(filename, "r");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
fclose(file);
- return TRUE;
+ return true;
}
// Builds the file name by default.
@@ -4389,7 +4389,7 @@ void CMainDialog::IOReadName() sprintf(name, "%s %d - %s", resume, m_sel[m_index]+1, line);
pe->SetText(name);
pe->SetCursor(strlen(name), 0);
- pe->SetFocus(TRUE);
+ pe->SetFocus(true);
}
// Updates the list of games recorded on disk.
@@ -4450,7 +4450,7 @@ void CMainDialog::IOReadList() }
pl->SetSelect(j-1);
- pl->ShowSelect(FALSE); // shows the selected columns
+ pl->ShowSelect(false); // shows the selected columns
}
// Updates the buttons according to the selected part in the list.
@@ -4560,7 +4560,7 @@ void CMainDialog::IODeleteScene() // Writes the scene.
-BOOL CMainDialog::IOWriteScene()
+bool CMainDialog::IOWriteScene()
{
CWindow* pw;
CList* pl;
@@ -4571,14 +4571,14 @@ BOOL CMainDialog::IOWriteScene() int sel;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
pl = (CList*)pw->SearchControl(EVENT_INTERFACE_IOLIST);
- if ( pl == 0 ) return FALSE;
+ if ( pl == 0 ) return false;
pe = (CEdit*)pw->SearchControl(EVENT_INTERFACE_IONAME);
- if ( pe == 0 ) return FALSE;
+ if ( pe == 0 ) return false;
sel = pl->RetSelect();
- if ( sel == -1 ) return FALSE;
+ if ( sel == -1 ) return false;
_mkdir("Savegame"); // if doesn't exist yet!
sprintf(filename, "%s\\%s", m_savegameDir, m_main->RetGamerName());
@@ -4594,12 +4594,12 @@ BOOL CMainDialog::IOWriteScene() m_shotDelay = 3;
sprintf(m_shotName, "%s\\%s\\save%c%.3d\\screen.bmp", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel);
- return TRUE;
+ return true;
}
// Reads the scene.
-BOOL CMainDialog::IOReadScene()
+bool CMainDialog::IOReadScene()
{
FILE* file;
CWindow* pw;
@@ -4611,18 +4611,18 @@ BOOL CMainDialog::IOReadScene() int sel, i;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
pl = (CList*)pw->SearchControl(EVENT_INTERFACE_IOLIST);
- if ( pl == 0 ) return FALSE;
+ if ( pl == 0 ) return false;
sel = pl->RetSelect();
- if ( sel == -1 ) return FALSE;
+ if ( sel == -1 ) return false;
sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel);
sprintf(filecbot, "%s\\%s\\save%c%.3d\\cbot.run", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel);
file = fopen(filename, "r");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
while ( fgets(line, 500, file) != NULL )
{
@@ -4656,7 +4656,7 @@ BOOL CMainDialog::IOReadScene() if ( m_sceneRank/100 == 0 )
{
fclose(file);
- return FALSE;
+ return false;
}
}
}
@@ -4668,7 +4668,7 @@ BOOL CMainDialog::IOReadScene() strcpy(m_sceneRead, filename);
strcpy(m_stackRead, filecbot);
- return TRUE;
+ return true;
}
@@ -4721,7 +4721,7 @@ void CMainDialog::UpdateSceneChap(int &chap) char line[500];
char name[100];
int i, j;
- BOOL bPassed, bDo;
+ bool bPassed, bDo;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
if ( pw == 0 ) return;
@@ -4750,7 +4750,7 @@ void CMainDialog::UpdateSceneChap(int &chap) do // sorts all names:
{
- bDo = FALSE;
+ bDo = false;
for ( i=0 ; i<m_userTotal-1 ; i++ )
{
if ( strcmp(m_userList[i], m_userList[i+1]) > 0 )
@@ -4758,7 +4758,7 @@ void CMainDialog::UpdateSceneChap(int &chap) strcpy(name, m_userList[i]);
strcpy(m_userList[i], m_userList[i+1]);
strcpy(m_userList[i+1], name);
- bDo = TRUE;
+ bDo = true;
}
}
}
@@ -4798,7 +4798,7 @@ void CMainDialog::UpdateSceneChap(int &chap) }
pl->SetName(j, name);
- pl->SetEnable(j, TRUE);
+ pl->SetEnable(j, true);
}
}
else
@@ -4846,7 +4846,7 @@ void CMainDialog::UpdateSceneChap(int &chap) sprintf(line, "%d: %s", j+1, name);
pl->SetName(j, line);
pl->SetCheck(j, bPassed);
- pl->SetEnable(j, TRUE);
+ pl->SetEnable(j, true);
if ( m_phase == PHASE_MISSION && !m_main->RetShowAll() && !bPassed )
{
@@ -4873,7 +4873,7 @@ void CMainDialog::UpdateSceneChap(int &chap) if ( chap > j-1 ) chap = j-1;
pl->SetSelect(chap);
- pl->ShowSelect(FALSE); // shows the selected columns
+ pl->ShowSelect(false); // shows the selected columns
}
// Updates the list of exercises or missions.
@@ -4888,7 +4888,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) char line[500];
char name[100];
int i, j;
- BOOL bPassed;
+ bool bPassed;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
if ( pw == 0 ) return;
@@ -4944,7 +4944,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) sprintf(line, "%d: %s", j+1, name);
pl->SetName(j, line);
pl->SetCheck(j, bPassed);
- pl->SetEnable(j, TRUE);
+ pl->SetEnable(j, true);
if ( m_phase == PHASE_MISSION && !m_main->RetShowAll() && !bPassed )
{
@@ -4976,7 +4976,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) if ( sel > j-1 ) sel = j-1;
pl->SetSelect(sel);
- pl->ShowSelect(FALSE); // shows the selected columns
+ pl->ShowSelect(false); // shows the selected columns
}
// Updates the button "solution" according to cheat code.
@@ -4995,7 +4995,7 @@ void CMainDialog::ShowSoluceUpdate() m_phase == PHASE_USER ||
m_phase == PHASE_PROTO )
{
- m_bSceneSoluce = FALSE;
+ m_bSceneSoluce = false;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
if ( pw == 0 ) return;
@@ -5008,13 +5008,13 @@ void CMainDialog::ShowSoluceUpdate() {
pc->SetState(STATE_VISIBLE);
pc->SetState(STATE_CHECK);
- m_bSceneSoluce = TRUE;
+ m_bSceneSoluce = true;
}
else
{
pc->ClearState(STATE_VISIBLE);
pc->ClearState(STATE_CHECK);
- m_bSceneSoluce = FALSE;
+ m_bSceneSoluce = false;
}
}
}
@@ -5032,7 +5032,7 @@ void CMainDialog::UpdateSceneResume(int rank) char line[500];
char name[500];
int i, numTry;
- BOOL bPassed, bVisible;
+ bool bPassed, bVisible;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
if ( pw == 0 ) return;
@@ -5042,19 +5042,19 @@ void CMainDialog::UpdateSceneResume(int rank) if ( pc == 0 )
{
- m_bSceneSoluce = FALSE;
+ m_bSceneSoluce = false;
}
else
{
numTry = RetGamerInfoTry(rank);
bPassed = RetGamerInfoPassed(rank);
bVisible = ( numTry > 2 || bPassed || m_main->RetShowSoluce() );
- if ( !RetSoluce4() ) bVisible = FALSE;
+ if ( !RetSoluce4() ) bVisible = false;
pc->SetState(STATE_VISIBLE, bVisible);
if ( !bVisible )
{
pc->ClearState(STATE_CHECK);
- m_bSceneSoluce = FALSE;
+ m_bSceneSoluce = false;
}
}
@@ -5117,7 +5117,7 @@ void CMainDialog::UpdateDisplayDevice() }
pl->SetSelect(selectDevices);
- pl->ShowSelect(FALSE);
+ pl->ShowSelect(false);
m_setupSelDevice = selectDevices;
}
@@ -5152,7 +5152,7 @@ void CMainDialog::UpdateDisplayMode() }
pl->SetSelect(selectModes);
- pl->ShowSelect(FALSE);
+ pl->ShowSelect(false);
m_setupSelMode = selectModes;
}
@@ -5166,7 +5166,7 @@ void CMainDialog::ChangeDisplay() CCheck* pc;
char* device;
char* mode;
- BOOL bFull;
+ bool bFull;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
if ( pw == 0 ) return;
@@ -5206,7 +5206,7 @@ void CMainDialog::UpdateApply() CList* pl;
CCheck* pc;
int sel1, sel2;
- BOOL bFull;
+ bool bFull;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5);
if ( pw == 0 ) return;
@@ -5891,7 +5891,7 @@ void CMainDialog::SetupRecall() void CMainDialog::ChangeSetupQuality(int quality)
{
- BOOL bEnable;
+ bool bEnable;
float value;
int iValue;
@@ -5931,7 +5931,7 @@ void CMainDialog::ChangeSetupQuality(int quality) if ( quality > 0 ) iValue = 2;
m_engine->SetTextureQuality(iValue);
- m_engine->FirstExecuteAdapt(FALSE);
+ m_engine->FirstExecuteAdapt(false);
}
@@ -6095,8 +6095,8 @@ void CMainDialog::StartAbort() FPOINT pos, dim;
char name[100];
- StartDialog(FPOINT(0.3f, 0.8f), TRUE, FALSE, FALSE);
- m_bDialogDelete = FALSE;
+ StartDialog(FPOINT(0.3f, 0.8f), true, false, false);
+ m_bDialogDelete = false;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
if ( pw == 0 ) return;
@@ -6177,8 +6177,8 @@ void CMainDialog::StartDeleteObject() FPOINT pos, dim;
char name[100];
- StartDialog(FPOINT(0.7f, 0.3f), FALSE, TRUE, TRUE);
- m_bDialogDelete = TRUE;
+ StartDialog(FPOINT(0.7f, 0.3f), false, true, true);
+ m_bDialogDelete = true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
if ( pw == 0 ) return;
@@ -6212,8 +6212,8 @@ void CMainDialog::StartDeleteGame(char *gamer) char name[100];
char text[100];
- StartDialog(FPOINT(0.7f, 0.3f), FALSE, TRUE, TRUE);
- m_bDialogDelete = TRUE;
+ StartDialog(FPOINT(0.7f, 0.3f), false, true, true);
+ m_bDialogDelete = true;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
if ( pw == 0 ) return;
@@ -6247,7 +6247,7 @@ void CMainDialog::StartQuit() FPOINT pos, dim;
char name[100];
- StartDialog(FPOINT(0.6f, 0.3f), FALSE, TRUE, TRUE);
+ StartDialog(FPOINT(0.6f, 0.3f), false, true, true);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
if ( pw == 0 ) return;
@@ -6273,7 +6273,7 @@ void CMainDialog::StartQuit() // Beginning of displaying a dialog.
-void CMainDialog::StartDialog(FPOINT dim, BOOL bFire, BOOL bOK, BOOL bCancel)
+void CMainDialog::StartDialog(FPOINT dim, bool bFire, bool bOK, bool bCancel)
{
CWindow* pw;
CButton* pb;
@@ -6354,7 +6354,7 @@ void CMainDialog::StartDialog(FPOINT dim, BOOL bFire, BOOL bOK, BOOL bCancel) }
m_sound->Play(SOUND_TZOING);
- m_bDialog = TRUE;
+ m_bDialog = true;
}
// Animation of a dialog.
@@ -6503,18 +6503,18 @@ void CMainDialog::StopDialog() StopSuspend();
m_interface->DeleteControl(EVENT_WINDOW9);
- m_bDialog = FALSE;
+ m_bDialog = false;
}
// Suspends the simulation for a dialog phase.
void CMainDialog::StartSuspend()
{
- m_sound->MuteAll(TRUE);
+ m_sound->MuteAll(true);
m_main->ClearInterface();
m_bInitPause = m_engine->RetPause();
- m_engine->SetPause(TRUE);
- m_engine->SetOverFront(FALSE); // over flat behind
+ m_engine->SetPause(true);
+ m_engine->SetOverFront(false); // over flat behind
m_main->CreateShortcuts();
m_main->StartSuspend();
m_initCamera = m_camera->RetType();
@@ -6525,10 +6525,10 @@ void CMainDialog::StartSuspend() void CMainDialog::StopSuspend()
{
- m_sound->MuteAll(FALSE);
+ m_sound->MuteAll(false);
m_main->ClearInterface();
- if ( !m_bInitPause ) m_engine->SetPause(FALSE);
- m_engine->SetOverFront(TRUE); // over flat front
+ if ( !m_bInitPause ) m_engine->SetPause(false);
+ m_engine->SetOverFront(true); // over flat front
m_main->CreateShortcuts();
m_main->StopSuspend();
m_camera->SetType(m_initCamera);
@@ -6537,14 +6537,14 @@ void CMainDialog::StopSuspend() // Whether to use tooltips.
-BOOL CMainDialog::RetTooltip()
+bool CMainDialog::RetTooltip()
{
return m_bTooltip;
}
// Specifies whether a dialog is displayed.
-BOOL CMainDialog::IsDialog()
+bool CMainDialog::IsDialog()
{
return m_bDialog;
}
@@ -6622,7 +6622,7 @@ char* CMainDialog::RetSceneDir() // Whether to show the solution.
-BOOL CMainDialog::RetSceneSoluce()
+bool CMainDialog::RetSceneSoluce()
{
return m_bSceneSoluce;
}
@@ -6644,35 +6644,35 @@ char* CMainDialog::RetPublicDir() // Indicates if there are reflections on the buttons.
-BOOL CMainDialog::RetGlint()
+bool CMainDialog::RetGlint()
{
return m_bGlint;
}
// Whether to show 4:solutions.
-BOOL CMainDialog::RetSoluce4()
+bool CMainDialog::RetSoluce4()
{
return m_bSoluce4;
}
// Whether to show the cinematics.
-BOOL CMainDialog::RetMovies()
+bool CMainDialog::RetMovies()
{
return m_bMovies;
}
// IWhether to make an animation in CTaskReset.
-BOOL CMainDialog::RetNiceReset()
+bool CMainDialog::RetNiceReset()
{
return m_bNiceReset;
}
// Indicates whether the fire causes damage to its own units.
-BOOL CMainDialog::RetHimselfDamage()
+bool CMainDialog::RetHimselfDamage()
{
return m_bHimselfDamage;
}
@@ -6781,7 +6781,7 @@ int CMainDialog::RetGamerGlasses() return m_perso.glasses;
}
-BOOL CMainDialog::RetGamerOnlyHead()
+bool CMainDialog::RetGamerOnlyHead()
{
return (m_phase == PHASE_PERSO && m_persoTab == 0);
}
@@ -6809,7 +6809,7 @@ D3DCOLORVALUE CMainDialog::RetGamerColorBand() // Reads the file of the player.
-BOOL CMainDialog::ReadGamerInfo()
+bool CMainDialog::ReadGamerInfo()
{
FILE* file;
char line[100];
@@ -6818,12 +6818,12 @@ BOOL CMainDialog::ReadGamerInfo() for ( i=0 ; i<MAXSCENE ; i++ )
{
m_sceneInfo[i].numTry = 0;
- m_sceneInfo[i].bPassed = FALSE;
+ m_sceneInfo[i].bPassed = false;
}
sprintf(line, "%s\\%s\\%s.gam", m_savegameDir, m_main->RetGamerName(), m_sceneName);
file = fopen(line, "r");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
if ( fgets(line, 100, file) != NULL )
{
@@ -6846,12 +6846,12 @@ BOOL CMainDialog::ReadGamerInfo() }
fclose(file);
- return TRUE;
+ return true;
}
// Writes the file of the player.
-BOOL CMainDialog::WriteGamerInfo()
+bool CMainDialog::WriteGamerInfo()
{
FILE* file;
char line[100];
@@ -6859,7 +6859,7 @@ BOOL CMainDialog::WriteGamerInfo() sprintf(line, "%s\\%s\\%s.gam", m_savegameDir, m_main->RetGamerName(), m_sceneName);
file = fopen(line, "w");
- if ( file == NULL ) return FALSE;
+ if ( file == NULL ) return false;
sprintf(line, "CurrentChapter=%d CurrentSel=%d\n",
m_chap[m_index]+1, m_sel[m_index]+1);
@@ -6875,7 +6875,7 @@ BOOL CMainDialog::WriteGamerInfo() }
fclose(file);
- return TRUE;
+ return true;
}
void CMainDialog::SetGamerInfoTry(int rank, int numTry)
@@ -6891,17 +6891,17 @@ int CMainDialog::RetGamerInfoTry(int rank) return m_sceneInfo[rank].numTry;
}
-void CMainDialog::SetGamerInfoPassed(int rank, BOOL bPassed)
+void CMainDialog::SetGamerInfoPassed(int rank, bool bPassed)
{
int chap, i;
- BOOL bAll;
+ bool bAll;
if ( rank < 0 || rank >= MAXSCENE ) return;
m_sceneInfo[rank].bPassed = bPassed;
if ( bPassed )
{
- bAll = TRUE;
+ bAll = true;
chap = rank/100;
for ( i=0 ; i<m_maxList ; i++ )
{
@@ -6912,16 +6912,16 @@ void CMainDialog::SetGamerInfoPassed(int rank, BOOL bPassed) }
}
-BOOL CMainDialog::RetGamerInfoPassed(int rank)
+bool CMainDialog::RetGamerInfoPassed(int rank)
{
- if ( rank < 0 || rank >= MAXSCENE ) return FALSE;
+ if ( rank < 0 || rank >= MAXSCENE ) return false;
return m_sceneInfo[rank].bPassed;
}
// Passes to the next mission, and possibly in the next chapter.
-BOOL CMainDialog::NextMission()
+bool CMainDialog::NextMission()
{
m_sel[m_index] ++; // next mission
@@ -6931,7 +6931,7 @@ BOOL CMainDialog::NextMission() m_sel[m_index] = 0; // first mission
}
- return TRUE;
+ return true;
}
diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index fbc3f1e..4062c8d 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -62,7 +62,7 @@ public: CMainDialog(CInstanceManager* iMan);
~CMainDialog();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void ChangePhase(Phase phase);
void SetSceneRead(char* name);
@@ -74,16 +74,16 @@ public: char* RetSceneName();
int RetSceneRank();
char* RetSceneDir();
- BOOL RetSceneSoluce();
+ bool RetSceneSoluce();
char* RetSavegameDir();
char* RetPublicDir();
- BOOL RetTooltip();
- BOOL RetGlint();
- BOOL RetSoluce4();
- BOOL RetMovies();
- BOOL RetNiceReset();
- BOOL RetHimselfDamage();
+ bool RetTooltip();
+ bool RetGlint();
+ bool RetSoluce4();
+ bool RetMovies();
+ bool RetNiceReset();
+ bool RetHimselfDamage();
void SetUserDir(char *base, int rank);
void BuildSceneName(char *filename, char *base, int rank);
@@ -94,10 +94,10 @@ public: void StartDeleteObject();
void StartDeleteGame(char *gamer);
void StartQuit();
- void StartDialog(FPOINT dim, BOOL bFire, BOOL bOK, BOOL bCancel);
+ void StartDialog(FPOINT dim, bool bFire, bool bOK, bool bCancel);
void FrameDialog(float rTime);
void StopDialog();
- BOOL IsDialog();
+ bool IsDialog();
void StartSuspend();
void StopSuspend();
@@ -105,13 +105,13 @@ public: void SetupMemorize();
void SetupRecall();
- BOOL ReadGamerInfo();
- BOOL WriteGamerInfo();
+ bool ReadGamerInfo();
+ bool WriteGamerInfo();
void SetGamerInfoTry(int rank, int numTry);
int RetGamerInfoTry(int rank);
- void SetGamerInfoPassed(int rank, BOOL bPassed);
- BOOL RetGamerInfoPassed(int rank);
- BOOL NextMission();
+ void SetGamerInfoPassed(int rank, bool bPassed);
+ bool RetGamerInfoPassed(int rank);
+ bool NextMission();
void WriteGamerPerso(char *gamer);
void ReadGamerPerso(char *gamer);
@@ -119,7 +119,7 @@ public: int RetGamerFace(char *gamer);
int RetGamerFace();
int RetGamerGlasses();
- BOOL RetGamerOnlyHead();
+ bool RetGamerOnlyHead();
float RetPersoAngle();
D3DCOLORVALUE RetGamerColorHair();
D3DCOLORVALUE RetGamerColorCombi();
@@ -131,7 +131,7 @@ public: protected:
void GlintMove();
void FrameParticule(float rTime);
- void NiceParticule(FPOINT mouse, BOOL bPress);
+ void NiceParticule(FPOINT mouse, bool bPress);
void ReadNameList();
void UpdateNameList();
void UpdateNameEdit();
@@ -145,13 +145,13 @@ protected: void FixPerso(int rank, int index);
void ColorPerso();
void DefPerso();
- BOOL IsIOReadScene();
+ bool IsIOReadScene();
void IOReadName();
void IOReadList();
void IOUpdateList();
void IODeleteScene();
- BOOL IOWriteScene();
- BOOL IOReadScene();
+ bool IOWriteScene();
+ bool IOReadScene();
int RetChapPassed();
void UpdateSceneChap(int &chap);
void UpdateSceneList(int chap, int &sel);
@@ -201,12 +201,12 @@ protected: char m_stackRead[100]; // name of the scene to read
char m_sceneName[20]; // name of the scene to play
int m_sceneRank; // rank of the scene to play
- BOOL m_bSceneSoluce; // shows the solution
- BOOL m_bSimulSetup; // adjustment during the game
- BOOL m_accessEnable;
- BOOL m_accessMission;
- BOOL m_accessUser;
- BOOL m_bDeleteGamer;
+ bool m_bSceneSoluce; // shows the solution
+ bool m_bSimulSetup; // adjustment during the game
+ bool m_accessEnable;
+ bool m_accessMission;
+ bool m_accessUser;
+ bool m_bDeleteGamer;
int m_userTotal;
char m_userList[USERLISTMAX][100];
@@ -216,33 +216,33 @@ protected: int m_setupSelDevice;
int m_setupSelMode;
- BOOL m_setupFull;
-
- BOOL m_bTooltip; // tooltips to be displayed?
- BOOL m_bGlint; // reflections on buttons?
- BOOL m_bRain; // rain in the interface?
- BOOL m_bSoluce4; // solutions in program 4?
- BOOL m_bMovies; // cinematics?
- BOOL m_bNiceReset; // for CTaskReset
- BOOL m_bHimselfDamage; // for shots
- BOOL m_bCameraScroll; // for CCamera
- BOOL m_bCameraInvertX; // for CCamera
- BOOL m_bCameraInvertY; // for CCamera
- BOOL m_bEffect; // for CCamera
+ bool m_setupFull;
+
+ bool m_bTooltip; // tooltips to be displayed?
+ bool m_bGlint; // reflections on buttons?
+ bool m_bRain; // rain in the interface?
+ bool m_bSoluce4; // solutions in program 4?
+ bool m_bMovies; // cinematics?
+ bool m_bNiceReset; // for CTaskReset
+ bool m_bHimselfDamage; // for shots
+ bool m_bCameraScroll; // for CCamera
+ bool m_bCameraInvertX; // for CCamera
+ bool m_bCameraInvertY; // for CCamera
+ bool m_bEffect; // for CCamera
FPOINT m_glintMouse;
float m_glintTime;
int m_loadingCounter;
- BOOL m_bDialog; // this dialogue?
- BOOL m_bDialogFire; // setting on fire?
- BOOL m_bDialogDelete;
+ bool m_bDialog; // this dialogue?
+ bool m_bDialogFire; // setting on fire?
+ bool m_bDialogDelete;
FPOINT m_dialogPos;
FPOINT m_dialogDim;
float m_dialogParti;
float m_dialogTime;
- BOOL m_bInitPause;
+ bool m_bInitPause;
CameraType m_initCamera;
int m_partiPhase[10];
diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp index 2366f8b..9575cbc 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -57,7 +57,7 @@ CMainMap::CMainMap(CInstanceManager* iMan) m_engine = (CD3DEngine*)m_iMan->SearchInstance(CLASS_ENGINE);
m_mapMode = 1;
- m_bFixImage = FALSE;
+ m_bFixImage = false;
}
// Destructor of the application card.
@@ -108,7 +108,7 @@ void CMainMap::SetFixImage(char *filename) if ( pm == 0 ) return;
pw->DeleteControl(EVENT_OBJECT_MAPZOOM);
- m_bFixImage = TRUE;
+ m_bFixImage = true;
pm->SetFixImage(filename);
}
@@ -133,7 +133,7 @@ void CMainMap::FloorColorMap(D3DCOLORVALUE floor, D3DCOLORVALUE water) // Shows or hides the minimap.
-void CMainMap::ShowMap(BOOL bShow)
+void CMainMap::ShowMap(bool bShow)
{
CWindow* pw;
CMap* pm;
@@ -276,7 +276,7 @@ void CMainMap::ZoomMap() // Enables or disables the card.
-void CMainMap::MapEnable(BOOL bEnable)
+void CMainMap::MapEnable(bool bEnable)
{
CWindow* pw;
CMap* pm;
@@ -300,7 +300,7 @@ void CMainMap::MapEnable(BOOL bEnable) // Specifies the type of icon for the selected object.
-void CMainMap::SetToy(BOOL bToy)
+void CMainMap::SetToy(bool bToy)
{
CWindow* pw;
CMap* pm;
@@ -317,7 +317,7 @@ void CMainMap::SetToy(BOOL bToy) // Specifies the parameters when using a still image.
void CMainMap::SetFixParam(float zoom, float ox, float oy, float angle,
- int mode, BOOL bDebug)
+ int mode, bool bDebug)
{
CWindow* pw;
CMap* pm;
@@ -354,14 +354,14 @@ void CMainMap::UpdateMap() // Indicates if the mini-map is visible.
-BOOL CMainMap::RetShowMap()
+bool CMainMap::RetShowMap()
{
return ( m_mapMode != 0 );
}
// Indicates whether the mini-map displays a still image.
-BOOL CMainMap::RetFixImage()
+bool CMainMap::RetFixImage()
{
return m_bFixImage;
}
@@ -369,7 +369,7 @@ BOOL CMainMap::RetFixImage() // The object is detected in the mini-map.
-CObject* CMainMap::DetectMap(FPOINT pos, BOOL &bInMap)
+CObject* CMainMap::DetectMap(FPOINT pos, bool &bInMap)
{
CWindow* pw;
CMap* pm;
@@ -377,7 +377,7 @@ CObject* CMainMap::DetectMap(FPOINT pos, BOOL &bInMap) pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW1);
if ( pw == 0 ) return 0;
- bInMap = FALSE;
+ bInMap = false;
pm = (CMap*)pw->SearchControl(EVENT_OBJECT_MAP);
if ( pm == 0 ) return 0;
return pm->DetectObject(pos, bInMap);
diff --git a/src/ui/mainmap.h b/src/ui/mainmap.h index cd74f39..1c0e1fd 100644 --- a/src/ui/mainmap.h +++ b/src/ui/mainmap.h @@ -37,18 +37,18 @@ public: void CreateMap();
void SetFixImage(char *filename);
void FloorColorMap(D3DCOLORVALUE floor, D3DCOLORVALUE water);
- void ShowMap(BOOL bShow);
+ void ShowMap(bool bShow);
void DimMap();
float RetZoomMap();
void ZoomMap(float zoom);
void ZoomMap();
- void MapEnable(BOOL bEnable);
- BOOL RetShowMap();
- BOOL RetFixImage();
- CObject* DetectMap(FPOINT pos, BOOL &bInMap);
+ void MapEnable(bool bEnable);
+ bool RetShowMap();
+ bool RetFixImage();
+ CObject* DetectMap(FPOINT pos, bool &bInMap);
void SetHilite(CObject* pObj);
- void SetToy(BOOL bToy);
- void SetFixParam(float zoom, float ox, float oy, float angle, int mode, BOOL bDebug);
+ void SetToy(bool bToy);
+ void SetFixParam(float zoom, float ox, float oy, float angle, int mode, bool bDebug);
protected:
void CenterMap();
@@ -60,7 +60,7 @@ protected: CInterface* m_interface;
int m_mapMode;
- BOOL m_bFixImage;
+ bool m_bFixImage;
};
diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index 7ac35af..c68f21c 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -61,7 +61,7 @@ CMainShort::~CMainShort() -void CMainShort::SetMode(BOOL bBuilding)
+void CMainShort::SetMode(bool bBuilding)
{
m_bBuilding = bBuilding;
}
@@ -106,7 +106,7 @@ static EventMsg table_sc_em[20] = // Interface creates shortcuts to the units.
-BOOL CMainShort::CreateShortcuts()
+bool CMainShort::CreateShortcuts()
{
CObject* pObj;
CControl* pc;
@@ -115,7 +115,7 @@ BOOL CMainShort::CreateShortcuts() int i, rank, icon;
char name[100];
- if ( m_main->RetFixScene() ) return FALSE;
+ if ( m_main->RetFixScene() ) return false;
m_interface->DeleteControl(EVENT_OBJECT_MOVIELOCK);
m_interface->DeleteControl(EVENT_OBJECT_EDITLOCK);
@@ -136,14 +136,14 @@ BOOL CMainShort::CreateShortcuts() !m_main->RetEditLock() ) // hangs during film?
{
m_interface->CreateShortcut(pos, dim, 7, EVENT_OBJECT_MOVIELOCK);
- return TRUE;
+ return true;
}
if ( !m_main->RetFreePhoto() &&
(m_main->RetEditLock() ||
m_engine->RetPause()) ) // hangs during edition?
{
m_interface->CreateShortcut(pos, dim, 6, EVENT_OBJECT_EDITLOCK);
- return TRUE;
+ return true;
}
rank = 0;
@@ -233,12 +233,12 @@ BOOL CMainShort::CreateShortcuts() }
UpdateShortcuts();
- return TRUE;
+ return true;
}
// Updates the interface shortcuts to the units.
-BOOL CMainShort::UpdateShortcuts()
+bool CMainShort::UpdateShortcuts()
{
CControl* pc;
int i;
@@ -254,7 +254,7 @@ BOOL CMainShort::UpdateShortcuts() pc->SetState(STATE_RUN, m_shortcuts[i]->IsProgram());
}
}
- return TRUE;
+ return true;
}
// Selects an object through a shortcut.
diff --git a/src/ui/mainshort.h b/src/ui/mainshort.h index a4ff831..1b507d4 100644 --- a/src/ui/mainshort.h +++ b/src/ui/mainshort.h @@ -34,10 +34,10 @@ public: CMainShort(CInstanceManager* iMan);
~CMainShort();
- void SetMode(BOOL bBuilding);
+ void SetMode(bool bBuilding);
void FlushShortcuts();
- BOOL CreateShortcuts();
- BOOL UpdateShortcuts();
+ bool CreateShortcuts();
+ bool UpdateShortcuts();
void SelectShortcut(EventMsg event);
void SelectNext();
CObject* DetectShort(FPOINT pos);
@@ -53,7 +53,7 @@ protected: CRobotMain* m_main;
CObject* m_shortcuts[20];
- BOOL m_bBuilding;
+ bool m_bBuilding;
};
diff --git a/src/ui/map.cpp b/src/ui/map.cpp index ceb663f..a4bdecb 100644 --- a/src/ui/map.cpp +++ b/src/ui/map.cpp @@ -43,13 +43,11 @@ CMap::CMap(CInstanceManager* iMan) : CControl(iMan)
{
- CControl::CControl(iMan);
-
m_main = (CRobotMain*)m_iMan->SearchInstance(CLASS_MAIN);
m_terrain = (CTerrain*)m_iMan->SearchInstance(CLASS_TERRAIN);
m_water = (CWater*)m_iMan->SearchInstance(CLASS_WATER);
- m_bEnable = TRUE;
+ m_bEnable = true;
m_time = 0.0f;
m_zoom = 2.0f;
m_offset.x = 0.0f;
@@ -71,8 +69,8 @@ CMap::CMap(CInstanceManager* iMan) : CControl(iMan) m_fixImage[0] = 0;
m_mode = 0;
- m_bToy = FALSE;
- m_bDebug = FALSE;
+ m_bToy = false;
+ m_bDebug = false;
}
// Object's destructor.
@@ -84,12 +82,12 @@ CMap::~CMap() // Creates a new button.
-BOOL CMap::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CMap::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
- return TRUE;
+ return true;
}
@@ -118,12 +116,12 @@ void CMap::SetMode(int mode) // Specifies the type of icon for the selected object.
-void CMap::SetToy(BOOL bToy)
+void CMap::SetToy(bool bToy)
{
m_bToy = bToy;
}
-void CMap::SetDebug(BOOL bDebug)
+void CMap::SetDebug(bool bDebug)
{
m_bDebug = bDebug;
}
@@ -146,13 +144,13 @@ float CMap::RetZoom() // Enables or disables the card.
-void CMap::SetEnable(BOOL bEnable)
+void CMap::SetEnable(bool bEnable)
{
m_bEnable = bEnable;
SetState(STATE_DEAD, !bEnable);
}
-BOOL CMap::RetEnable()
+bool CMap::RetEnable()
{
return m_bEnable;
}
@@ -182,7 +180,7 @@ void CMap::SetFixImage(char *filename) // Whether to use a still image.
-BOOL CMap::RetFixImage()
+bool CMap::RetFixImage()
{
return (m_fixImage[0] != 0);
}
@@ -190,11 +188,11 @@ BOOL CMap::RetFixImage() // Management of an event.
-BOOL CMap::EventProcess(const Event &event)
+bool CMap::EventProcess(const Event &event)
{
- BOOL bInMap;
+ bool bInMap;
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
CControl::EventProcess(event);
@@ -217,11 +215,11 @@ BOOL CMap::EventProcess(const Event &event) if ( CControl::Detect(event.pos) )
{
SelectObject(event.pos);
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
// Adjusts the offset to not exceed the card.
@@ -263,18 +261,18 @@ void CMap::SetHilite(CObject* pObj) // Detects an object in the map.
-CObject* CMap::DetectObject(FPOINT pos, BOOL &bInMap)
+CObject* CMap::DetectObject(FPOINT pos, bool &bInMap)
{
float dist, min;
int i, best;
- bInMap = FALSE;
+ bInMap = false;
if ( pos.x < m_pos.x ||
pos.y < m_pos.y ||
pos.x > m_pos.x+m_dim.x ||
pos.y > m_pos.y+m_dim.y ) return 0;
- bInMap = TRUE;
+ bInMap = true;
pos.x = (pos.x-m_pos.x)/m_dim.x*256.0f;
pos.y = (pos.y-m_pos.y)/m_dim.y*256.0f; // 0..256
@@ -306,7 +304,7 @@ CObject* CMap::DetectObject(FPOINT pos, BOOL &bInMap) void CMap::SelectObject(FPOINT pos)
{
CObject *pObj;
- BOOL bInMap;
+ bool bInMap;
pObj = DetectObject(pos, bInMap);
if ( pObj != 0 )
@@ -365,25 +363,25 @@ void CMap::Draw() for ( i=0 ; i<m_totalFix ; i++ ) // fixed objects:
{
if ( i == m_hiliteRank ) continue;
- DrawObject(m_map[i].pos, m_map[i].dir, m_map[i].type, m_map[i].color, FALSE, FALSE);
+ DrawObject(m_map[i].pos, m_map[i].dir, m_map[i].type, m_map[i].color, false, false);
}
for ( i=MAPMAXOBJECT-2 ; i>m_totalMove ; i-- ) // moving objects:
{
if ( i == m_hiliteRank ) continue;
- DrawObject(m_map[i].pos, m_map[i].dir, m_map[i].type, m_map[i].color, FALSE, FALSE);
+ DrawObject(m_map[i].pos, m_map[i].dir, m_map[i].type, m_map[i].color, false, false);
}
i = MAPMAXOBJECT-1;
if ( m_map[i].bUsed && i != m_hiliteRank ) // selection:
{
- DrawObject(m_map[i].pos, m_map[i].dir, m_map[i].type, m_map[i].color, TRUE, FALSE);
+ DrawObject(m_map[i].pos, m_map[i].dir, m_map[i].type, m_map[i].color, true, false);
}
if ( m_hiliteRank != -1 && m_map[m_hiliteRank].bUsed )
{
i = m_hiliteRank;
- DrawObject(m_map[i].pos, m_map[i].dir, m_map[i].type, m_map[i].color, FALSE, TRUE);
+ DrawObject(m_map[i].pos, m_map[i].dir, m_map[i].type, m_map[i].color, false, true);
DrawHilite(m_map[i].pos);
}
}
@@ -439,7 +437,7 @@ void CMap::DrawFocus(FPOINT pos, float dir, ObjectType type, MapColor color) FPOINT p0, p1, p2, uv1, uv2, rel;
float aMin, aMax, aOct, focus, a;
float limit[5];
- BOOL bEnding;
+ bool bEnding;
int quart;
if ( m_bToy || m_fixImage[0] != 0 ) return; // map with still image?
@@ -489,7 +487,7 @@ void CMap::DrawFocus(FPOINT pos, float dir, ObjectType type, MapColor color) m_engine->SetTexture("button2.tga");
m_engine->SetState(D3DSTATETTw);
- bEnding = FALSE;
+ bEnding = false;
do
{
quart ++;
@@ -498,7 +496,7 @@ void CMap::DrawFocus(FPOINT pos, float dir, ObjectType type, MapColor color) if ( aOct >= aMax-CHOUIA )
{
aOct = aMax;
- bEnding = TRUE;
+ bEnding = true;
}
p0 = pos;
@@ -517,19 +515,19 @@ void CMap::DrawFocus(FPOINT pos, float dir, ObjectType type, MapColor color) // Draw an object.
void CMap::DrawObject(FPOINT pos, float dir, ObjectType type, MapColor color,
- BOOL bSelect, BOOL bHilite)
+ bool bSelect, bool bHilite)
{
FPOINT p1, p2, p3, p4, p5, dim, uv1, uv2;
- BOOL bOut, bUp, bDown, bLeft, bRight;
+ bool bOut, bUp, bDown, bLeft, bRight;
pos.x = (pos.x-m_offset.x)*(m_zoom*0.5f)/m_half+0.5f;
pos.y = (pos.y-m_offset.y)*(m_zoom*0.5f)/m_half+0.5f;
- bOut = bUp = bDown = bLeft = bRight = FALSE;
- if ( pos.x < 0.06f ) { pos.x = 0.02f; bOut = bLeft = TRUE; }
- if ( pos.y < 0.06f ) { pos.y = 0.02f; bOut = bDown = TRUE; }
- if ( pos.x > 0.94f ) { pos.x = 0.98f; bOut = bRight = TRUE; }
- if ( pos.y > 0.94f ) { pos.y = 0.98f; bOut = bUp = TRUE; }
+ bOut = bUp = bDown = bLeft = bRight = false;
+ if ( pos.x < 0.06f ) { pos.x = 0.02f; bOut = bLeft = true; }
+ if ( pos.y < 0.06f ) { pos.y = 0.02f; bOut = bDown = true; }
+ if ( pos.x > 0.94f ) { pos.x = 0.98f; bOut = bRight = true; }
+ if ( pos.y > 0.94f ) { pos.y = 0.98f; bOut = bUp = true; }
pos.x = m_mapPos.x+m_mapDim.x*pos.x;
pos.y = m_mapPos.y+m_mapDim.y*pos.y;
@@ -619,13 +617,13 @@ void CMap::DrawObject(FPOINT pos, float dir, ObjectType type, MapColor color, {
dim.x *= 3.0f;
dim.y *= 3.0f;
- bHilite = TRUE;
+ bHilite = true;
}
if ( type == OBJECT_TEEN34 ) // stone?
{
dim.x *= 2.0f;
dim.y *= 2.0f;
- bHilite = TRUE;
+ bHilite = true;
}
if ( color == MAPCOLOR_MOVE && bSelect )
@@ -729,7 +727,7 @@ void CMap::DrawObject(FPOINT pos, float dir, ObjectType type, MapColor color, {
if ( m_bRadar )
{
- DrawObjectIcon(pos, dim, color, type, TRUE);
+ DrawObjectIcon(pos, dim, color, type, true);
}
}
@@ -788,7 +786,7 @@ void CMap::DrawObject(FPOINT pos, float dir, ObjectType type, MapColor color, // Draws the icon of an object.
void CMap::DrawObjectIcon(FPOINT pos, FPOINT dim, MapColor color,
- ObjectType type, BOOL bHilite)
+ ObjectType type, bool bHilite)
{
FPOINT ppos, ddim, uv1, uv2;
float dp;
@@ -898,18 +896,18 @@ void CMap::DrawObjectIcon(FPOINT pos, FPOINT dim, MapColor color, void CMap::DrawHilite(FPOINT pos)
{
FPOINT dim, uv1, uv2;
- BOOL bOut, bUp, bDown, bLeft, bRight;
+ bool bOut, bUp, bDown, bLeft, bRight;
if ( m_bToy || m_fixImage[0] != 0 ) return; // map with still image?
pos.x = (pos.x-m_offset.x)*(m_zoom*0.5f)/m_half+0.5f;
pos.y = (pos.y-m_offset.y)*(m_zoom*0.5f)/m_half+0.5f;
- bOut = bUp = bDown = bLeft = bRight = FALSE;
- if ( pos.x < 0.06f ) { pos.x = 0.02f; bOut = bLeft = TRUE; }
- if ( pos.y < 0.06f ) { pos.y = 0.02f; bOut = bDown = TRUE; }
- if ( pos.x > 0.94f ) { pos.x = 0.98f; bOut = bRight = TRUE; }
- if ( pos.y > 0.94f ) { pos.y = 0.98f; bOut = bUp = TRUE; }
+ bOut = bUp = bDown = bLeft = bRight = false;
+ if ( pos.x < 0.06f ) { pos.x = 0.02f; bOut = bLeft = true; }
+ if ( pos.y < 0.06f ) { pos.y = 0.02f; bOut = bDown = true; }
+ if ( pos.x > 0.94f ) { pos.x = 0.98f; bOut = bRight = true; }
+ if ( pos.y > 0.94f ) { pos.y = 0.98f; bOut = bUp = true; }
pos.x = m_mapPos.x+m_mapDim.x*pos.x;
pos.y = m_mapPos.y+m_mapDim.y*pos.y;
@@ -1047,7 +1045,7 @@ void CMap::UpdateTerrain() if ( pos.x >= -m_half && pos.x <= m_half &&
pos.z >= -m_half && pos.z <= m_half )
{
- level = m_terrain->RetFloorLevel(pos, TRUE)/scale;
+ level = m_terrain->RetFloorLevel(pos, true)/scale;
}
else
{
@@ -1107,7 +1105,7 @@ void CMap::UpdateTerrain(int bx, int by, int ex, int ey) if ( pos.x >= -m_half && pos.x <= m_half &&
pos.z >= -m_half && pos.z <= m_half )
{
- level = m_terrain->RetFloorLevel(pos, TRUE)/scale;
+ level = m_terrain->RetFloorLevel(pos, true)/scale;
}
else
{
@@ -1152,7 +1150,7 @@ void CMap::FlushObject() for ( i=0 ; i<MAPMAXOBJECT ; i++ )
{
- m_map[i].bUsed = FALSE;
+ m_map[i].bUsed = false;
}
}
@@ -1188,7 +1186,7 @@ void CMap::UpdateObject(CObject* pObj) if ( type == OBJECT_RADAR )
{
- m_bRadar = TRUE; // radar exists
+ m_bRadar = true; // radar exists
}
color = MAPCOLOR_NULL;
@@ -1310,7 +1308,7 @@ void CMap::UpdateObject(CObject* pObj) m_map[MAPMAXOBJECT-1].pos.x = pos.x;
m_map[MAPMAXOBJECT-1].pos.y = pos.z;
m_map[MAPMAXOBJECT-1].dir = dir;
- m_map[MAPMAXOBJECT-1].bUsed = TRUE;
+ m_map[MAPMAXOBJECT-1].bUsed = true;
}
else
{
@@ -1323,7 +1321,7 @@ void CMap::UpdateObject(CObject* pObj) m_map[m_totalFix].pos.x = pos.x;
m_map[m_totalFix].pos.y = pos.z;
m_map[m_totalFix].dir = dir;
- m_map[m_totalFix].bUsed = TRUE;
+ m_map[m_totalFix].bUsed = true;
m_totalFix ++;
}
else
@@ -1334,7 +1332,7 @@ void CMap::UpdateObject(CObject* pObj) m_map[m_totalMove].pos.x = pos.x;
m_map[m_totalMove].pos.y = pos.z;
m_map[m_totalMove].dir = dir;
- m_map[m_totalMove].bUsed = TRUE;
+ m_map[m_totalMove].bUsed = true;
m_totalMove --;
}
}
diff --git a/src/ui/map.h b/src/ui/map.h index 30e1b2b..0a10dbf 100644 --- a/src/ui/map.h +++ b/src/ui/map.h @@ -67,27 +67,27 @@ public: CMap(CInstanceManager* iMan);
~CMap();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool EventProcess(const Event &event);
void Draw();
void UpdateTerrain();
void UpdateTerrain(int bx, int by, int ex, int ey);
void SetFixImage(char *filename);
- BOOL RetFixImage();
+ bool RetFixImage();
void SetOffset(float ox, float oy);
void SetAngle(float angle);
void SetMode(int mode);
- void SetToy(BOOL bToy);
- void SetDebug(BOOL bDebug);
+ void SetToy(bool bToy);
+ void SetDebug(bool bDebug);
void SetZoom(float value);
float RetZoom();
- void SetEnable(BOOL bEnable);
- BOOL RetEnable();
+ void SetEnable(bool bEnable);
+ bool RetEnable();
void SetFloorColor(D3DCOLORVALUE color);
void SetWaterColor(D3DCOLORVALUE color);
@@ -95,7 +95,7 @@ public: void FlushObject();
void UpdateObject(CObject* pObj);
- CObject* DetectObject(FPOINT pos, BOOL &bInMap);
+ CObject* DetectObject(FPOINT pos, bool &bInMap);
void SetHilite(CObject* pObj);
protected:
@@ -103,8 +103,8 @@ protected: void SelectObject(FPOINT pos);
FPOINT MapInter(FPOINT pos, float dir);
void DrawFocus(FPOINT pos, float dir, ObjectType type, MapColor color);
- void DrawObject(FPOINT pos, float dir, ObjectType type, MapColor color, BOOL bSelect, BOOL bHilite);
- void DrawObjectIcon(FPOINT pos, FPOINT dim, MapColor color, ObjectType type, BOOL bHilite);
+ void DrawObject(FPOINT pos, float dir, ObjectType type, MapColor color, bool bSelect, bool bHilite);
+ void DrawObjectIcon(FPOINT pos, FPOINT dim, MapColor color, ObjectType type, bool bHilite);
void DrawHilite(FPOINT pos);
void DrawTriangle(FPOINT p1, FPOINT p2, FPOINT p3, FPOINT uv1, FPOINT uv2);
void DrawPenta(FPOINT p1, FPOINT p2, FPOINT p3, FPOINT p4, FPOINT p5, FPOINT uv1, FPOINT uv2);
@@ -115,7 +115,7 @@ protected: CWater* m_water;
CRobotMain* m_main;
- BOOL m_bEnable;
+ bool m_bEnable;
float m_time;
float m_half;
float m_zoom;
@@ -129,11 +129,11 @@ protected: int m_hiliteRank;
FPOINT m_mapPos;
FPOINT m_mapDim;
- BOOL m_bRadar;
+ bool m_bRadar;
char m_fixImage[100];
int m_mode;
- BOOL m_bToy;
- BOOL m_bDebug;
+ bool m_bToy;
+ bool m_bDebug;
};
diff --git a/src/ui/scroll.cpp b/src/ui/scroll.cpp index eb61bd0..7cc8304 100644 --- a/src/ui/scroll.cpp +++ b/src/ui/scroll.cpp @@ -49,7 +49,7 @@ CScroll::CScroll(CInstanceManager* iMan) : CControl(iMan) m_eventUp = EVENT_NULL;
m_eventDown = EVENT_NULL;
- m_bCapture = FALSE;
+ m_bCapture = false;
}
// Object's destructor.
@@ -63,13 +63,13 @@ CScroll::~CScroll() // Creates a new button.
-BOOL CScroll::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CScroll::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
MoveAdjust();
- return TRUE;
+ return true;
}
@@ -107,7 +107,7 @@ void CScroll::MoveAdjust() m_buttonUp = new CButton(m_iMan);
pc = (CButton*)m_buttonUp;
pc->Create(FPOINT(0.0f, 0.0f), FPOINT(0.0f, 0.0f), 49, EVENT_NULL);
- pc->SetRepeat(TRUE);
+ pc->SetRepeat(true);
m_eventUp = pc->RetEventMsg();
}
@@ -116,7 +116,7 @@ void CScroll::MoveAdjust() m_buttonDown = new CButton(m_iMan);
pc = (CButton*)m_buttonDown;
pc->Create(FPOINT(0.0f, 0.0f), FPOINT(0.0f, 0.0f), 50, EVENT_NULL);
- pc->SetRepeat(TRUE);
+ pc->SetRepeat(true);
m_eventDown = pc->RetEventMsg();
}
}
@@ -163,7 +163,7 @@ void CScroll::AdjustGlint() -BOOL CScroll::SetState(int state, BOOL bState)
+bool CScroll::SetState(int state, bool bState)
{
if ( state & STATE_ENABLE )
{
@@ -174,7 +174,7 @@ BOOL CScroll::SetState(int state, BOOL bState) return CControl::SetState(state, bState);
}
-BOOL CScroll::SetState(int state)
+bool CScroll::SetState(int state)
{
if ( state & STATE_ENABLE )
{
@@ -185,7 +185,7 @@ BOOL CScroll::SetState(int state) return CControl::SetState(state);
}
-BOOL CScroll::ClearState(int state)
+bool CScroll::ClearState(int state)
{
if ( state & STATE_ENABLE )
{
@@ -199,7 +199,7 @@ BOOL CScroll::ClearState(int state) // Management of an event.
-BOOL CScroll::EventProcess(const Event &event)
+bool CScroll::EventProcess(const Event &event)
{
FPOINT pos, dim;
float hButton, h, value;
@@ -208,11 +208,11 @@ BOOL CScroll::EventProcess(const Event &event) if ( m_buttonUp != 0 && !m_bCapture )
{
- if ( !m_buttonUp->EventProcess(event) ) return FALSE;
+ if ( !m_buttonUp->EventProcess(event) ) return false;
}
if ( m_buttonDown != 0 && !m_bCapture )
{
- if ( !m_buttonDown->EventProcess(event) ) return FALSE;
+ if ( !m_buttonDown->EventProcess(event) ) return false;
}
if ( event.event == m_eventUp && m_step > 0.0f )
@@ -263,7 +263,7 @@ BOOL CScroll::EventProcess(const Event &event) newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
}
- m_bCapture = TRUE;
+ m_bCapture = true;
m_pressPos = event.pos;
m_pressValue = m_visibleValue;
}
@@ -292,7 +292,7 @@ BOOL CScroll::EventProcess(const Event &event) if ( event.event == EVENT_LBUTTONUP && m_bCapture )
{
- m_bCapture = FALSE;
+ m_bCapture = false;
}
if ( event.event == EVENT_KEYDOWN &&
@@ -314,7 +314,7 @@ BOOL CScroll::EventProcess(const Event &event) m_event->AddEvent(newEvent);
}
- return TRUE;
+ return true;
}
diff --git a/src/ui/scroll.h b/src/ui/scroll.h index 7975317..738581a 100644 --- a/src/ui/scroll.h +++ b/src/ui/scroll.h @@ -37,16 +37,16 @@ public: CScroll(CInstanceManager* iMan);
~CScroll();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
void SetPos(FPOINT pos);
void SetDim(FPOINT dim);
- BOOL SetState(int state, BOOL bState);
- BOOL SetState(int state);
- BOOL ClearState(int state);
+ bool SetState(int state, bool bState);
+ bool SetState(int state);
+ bool ClearState(int state);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
void SetVisibleValue(float value);
@@ -71,7 +71,7 @@ protected: float m_visibleRatio;
float m_step;
- BOOL m_bCapture;
+ bool m_bCapture;
FPOINT m_pressPos;
float m_pressValue;
diff --git a/src/ui/shortcut.cpp b/src/ui/shortcut.cpp index adf22eb..7022bf2 100644 --- a/src/ui/shortcut.cpp +++ b/src/ui/shortcut.cpp @@ -50,18 +50,18 @@ CShortcut::~CShortcut() // Creates a new button.
-BOOL CShortcut::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CShortcut::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CShortcut::EventProcess(const Event &event)
+bool CShortcut::EventProcess(const Event &event)
{
CControl::EventProcess(event);
@@ -77,11 +77,11 @@ BOOL CShortcut::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
diff --git a/src/ui/shortcut.h b/src/ui/shortcut.h index 4535e4b..0b36c84 100644 --- a/src/ui/shortcut.h +++ b/src/ui/shortcut.h @@ -32,9 +32,9 @@ public: CShortcut(CInstanceManager* iMan);
~CShortcut();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
diff --git a/src/ui/slider.cpp b/src/ui/slider.cpp index 34bc0e3..f01cd3f 100644 --- a/src/ui/slider.cpp +++ b/src/ui/slider.cpp @@ -54,12 +54,12 @@ CSlider::CSlider(CInstanceManager* iMan) : CControl(iMan) m_step = 0.0f;
m_marginButton = 0.0f;
- m_bHoriz = FALSE;
+ m_bHoriz = false;
m_eventUp = EVENT_NULL;
m_eventDown = EVENT_NULL;
- m_bCapture = FALSE;
+ m_bCapture = false;
}
// Object's destructor.
@@ -73,13 +73,13 @@ CSlider::~CSlider() // Creates a new button.
-BOOL CSlider::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CSlider::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
MoveAdjust();
- return TRUE;
+ return true;
}
@@ -119,7 +119,7 @@ void CSlider::MoveAdjust() {
m_buttonLeft = new CButton(m_iMan);
m_buttonLeft->Create(FPOINT(0.0f, 0.0f), FPOINT(0.0f, 0.0f), m_bHoriz?55:49, EVENT_NULL); // </^
- m_buttonLeft->SetRepeat(TRUE);
+ m_buttonLeft->SetRepeat(true);
if ( m_state & STATE_SHADOW ) m_buttonLeft->SetState(STATE_SHADOW);
m_eventUp = m_buttonLeft->RetEventMsg();
}
@@ -128,7 +128,7 @@ void CSlider::MoveAdjust() {
m_buttonRight = new CButton(m_iMan);
m_buttonRight->Create(FPOINT(0.0f, 0.0f), FPOINT(0.0f, 0.0f), m_bHoriz?48:50, EVENT_NULL); // >/v
- m_buttonRight->SetRepeat(TRUE);
+ m_buttonRight->SetRepeat(true);
if ( m_state & STATE_SHADOW ) m_buttonRight->SetState(STATE_SHADOW);
m_eventDown = m_buttonRight->RetEventMsg();
}
@@ -206,7 +206,7 @@ void CSlider::AdjustGlint() }
-BOOL CSlider::SetState(int state, BOOL bState)
+bool CSlider::SetState(int state, bool bState)
{
if ( (state & STATE_ENABLE) ||
(state & STATE_SHADOW) )
@@ -218,7 +218,7 @@ BOOL CSlider::SetState(int state, BOOL bState) return CControl::SetState(state, bState);
}
-BOOL CSlider::SetState(int state)
+bool CSlider::SetState(int state)
{
if ( (state & STATE_ENABLE) ||
(state & STATE_SHADOW) )
@@ -230,7 +230,7 @@ BOOL CSlider::SetState(int state) return CControl::SetState(state);
}
-BOOL CSlider::ClearState(int state)
+bool CSlider::ClearState(int state)
{
if ( (state & STATE_ENABLE) ||
(state & STATE_SHADOW) )
@@ -245,22 +245,22 @@ BOOL CSlider::ClearState(int state) // Management of an event.
-BOOL CSlider::EventProcess(const Event &event)
+bool CSlider::EventProcess(const Event &event)
{
FPOINT pos, dim;
float value;
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
CControl::EventProcess(event);
if ( m_buttonLeft != 0 && !m_bCapture )
{
- if ( !m_buttonLeft->EventProcess(event) ) return FALSE;
+ if ( !m_buttonLeft->EventProcess(event) ) return false;
}
if ( m_buttonRight != 0 && !m_bCapture )
{
- if ( !m_buttonRight->EventProcess(event) ) return FALSE;
+ if ( !m_buttonRight->EventProcess(event) ) return false;
}
if ( event.event == m_eventUp && m_step > 0.0f )
@@ -316,7 +316,7 @@ BOOL CSlider::EventProcess(const Event &event) newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- m_bCapture = TRUE;
+ m_bCapture = true;
m_pressPos = event.pos;
m_pressValue = m_visibleValue;
}
@@ -354,7 +354,7 @@ BOOL CSlider::EventProcess(const Event &event) if ( event.event == EVENT_LBUTTONUP && m_bCapture )
{
- m_bCapture = FALSE;
+ m_bCapture = false;
}
if ( event.event == EVENT_KEYDOWN &&
@@ -376,7 +376,7 @@ BOOL CSlider::EventProcess(const Event &event) m_event->AddEvent(newEvent);
}
- return TRUE;
+ return true;
}
diff --git a/src/ui/slider.h b/src/ui/slider.h index 91199ed..8d1033f 100644 --- a/src/ui/slider.h +++ b/src/ui/slider.h @@ -34,16 +34,16 @@ public: CSlider(CInstanceManager* iMan);
~CSlider();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
void SetPos(FPOINT pos);
void SetDim(FPOINT dim);
- BOOL SetState(int state, BOOL bState);
- BOOL SetState(int state);
- BOOL ClearState(int state);
+ bool SetState(int state, bool bState);
+ bool SetState(int state);
+ bool ClearState(int state);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
void SetLimit(float min, float max);
@@ -68,10 +68,10 @@ protected: float m_visibleValue;
float m_step;
- BOOL m_bHoriz;
+ bool m_bHoriz;
float m_marginButton;
- BOOL m_bCapture;
+ bool m_bCapture;
FPOINT m_pressPos;
float m_pressValue;
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index d169696..1cc522b 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -72,12 +72,12 @@ CStudio::CStudio(CInstanceManager* iMan) m_camera = (CCamera*)m_iMan->SearchInstance(CLASS_CAMERA);
m_sound = (CSound*)m_iMan->SearchInstance(CLASS_SOUND);
- m_bEditMaximized = FALSE;
- m_bEditMinimized = FALSE;
+ m_bEditMaximized = false;
+ m_bEditMinimized = false;
m_time = 0.0f;
- m_bRealTime = TRUE;
- m_bRunning = FALSE;
+ m_bRealTime = true;
+ m_bRunning = false;
m_fixInfoTextTime = 0.0f;
m_helpFilename[0] = 0;
m_dialog = SD_NULL;
@@ -93,7 +93,7 @@ CStudio::~CStudio() // Management of an event.
-BOOL CStudio::EventProcess(const Event &event)
+bool CStudio::EventProcess(const Event &event)
{
CWindow* pw;
CEdit* edit;
@@ -111,10 +111,10 @@ BOOL CStudio::EventProcess(const Event &event) }
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW3);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
edit = (CEdit*)pw->SearchControl(EVENT_STUDIO_EDIT);
- if ( edit == 0 ) return FALSE;
+ if ( edit == 0 ) return false;
if ( event.event == pw->RetEventMsgClose() )
{
@@ -167,7 +167,7 @@ BOOL CStudio::EventProcess(const Event &event) if ( event.event == EVENT_STUDIO_SIZE ) // size?
{
slider = (CSlider*)pw->SearchControl(EVENT_STUDIO_SIZE);
- if ( slider == 0 ) return FALSE;
+ if ( slider == 0 ) return false;
m_main->SetFontSize(9.0f+slider->RetVisibleValue()*6.0f);
ViewEditScript();
}
@@ -175,12 +175,12 @@ BOOL CStudio::EventProcess(const Event &event) if ( event.event == EVENT_STUDIO_TOOL && // instructions?
m_dialog == SD_NULL )
{
- m_main->StartDisplayInfo(SATCOM_HUSTON, FALSE);
+ m_main->StartDisplayInfo(SATCOM_HUSTON, false);
}
if ( event.event == EVENT_STUDIO_HELP && // help?
m_dialog == SD_NULL )
{
- m_main->StartDisplayInfo(SATCOM_PROG, FALSE);
+ m_main->StartDisplayInfo(SATCOM_PROG, false);
}
if ( event.event == EVENT_STUDIO_COMPILE ) // compile?
@@ -190,12 +190,12 @@ BOOL CStudio::EventProcess(const Event &event) if ( m_script->GetScript(edit) ) // compile
{
GetResource(RES_TEXT, RT_STUDIO_COMPOK, res);
- SetInfoText(res, FALSE);
+ SetInfoText(res, false);
}
else
{
m_script->GetError(buffer);
- SetInfoText(buffer, FALSE);
+ SetInfoText(buffer, false);
}
}
@@ -211,7 +211,7 @@ BOOL CStudio::EventProcess(const Event &event) {
if ( m_script->GetScript(edit) ) // compile
{
- SetInfoText("", FALSE);
+ SetInfoText("", false);
Event newEvent = event;
newEvent.event = EVENT_OBJECT_PROGSTART;
@@ -221,7 +221,7 @@ BOOL CStudio::EventProcess(const Event &event) {
char buffer[100];
m_script->GetError(buffer);
- SetInfoText(buffer, FALSE);
+ SetInfoText(buffer, false);
}
}
}
@@ -265,8 +265,8 @@ BOOL CStudio::EventProcess(const Event &event) {
m_editFinalPos = m_main->RetWindowPos();
m_editFinalDim = m_main->RetWindowDim();
- m_bEditMinimized = FALSE;
- m_bEditMaximized = FALSE;
+ m_bEditMinimized = false;
+ m_bEditMaximized = false;
}
else
{
@@ -274,8 +274,8 @@ BOOL CStudio::EventProcess(const Event &event) m_editFinalPos.y = -0.44f;
m_editFinalDim.x = 1.00f;
m_editFinalDim.y = 0.50f;
- m_bEditMinimized = TRUE;
- m_bEditMaximized = FALSE;
+ m_bEditMinimized = true;
+ m_bEditMaximized = false;
}
m_main->SetEditFull(m_bEditMaximized);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW3);
@@ -291,8 +291,8 @@ BOOL CStudio::EventProcess(const Event &event) {
m_editFinalPos = m_main->RetWindowPos();
m_editFinalDim = m_main->RetWindowDim();
- m_bEditMinimized = FALSE;
- m_bEditMaximized = FALSE;
+ m_bEditMinimized = false;
+ m_bEditMaximized = false;
}
else
{
@@ -300,8 +300,8 @@ BOOL CStudio::EventProcess(const Event &event) m_editFinalPos.y = 0.00f;
m_editFinalDim.x = 1.00f;
m_editFinalDim.y = 1.00f;
- m_bEditMinimized = FALSE;
- m_bEditMaximized = TRUE;
+ m_bEditMinimized = false;
+ m_bEditMaximized = true;
}
m_main->SetEditFull(m_bEditMaximized);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW3);
@@ -312,7 +312,7 @@ BOOL CStudio::EventProcess(const Event &event) }
}
- return TRUE;
+ return true;
}
@@ -338,7 +338,7 @@ float Evolution(float final, float actual, float time) // Makes the studio evolve as time elapsed.
-BOOL CStudio::EventFrame(const Event &event)
+bool CStudio::EventFrame(const Event &event)
{
CWindow* pw;
CEdit* edit;
@@ -351,21 +351,21 @@ BOOL CStudio::EventFrame(const Event &event) m_fixInfoTextTime -= event.rTime;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW3);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
edit = (CEdit*)pw->SearchControl(EVENT_STUDIO_EDIT);
- if ( edit == 0 ) return FALSE;
+ if ( edit == 0 ) return false;
list = (CList*)pw->SearchControl(EVENT_STUDIO_LIST);
- if ( list == 0 ) return FALSE;
+ if ( list == 0 ) return false;
if ( !m_script->IsRunning() && m_bRunning ) // stop?
{
- m_bRunning = FALSE;
+ m_bRunning = false;
UpdateFlux(); // stop
AdjustEditScript();
GetResource(RES_TEXT, RT_STUDIO_PROGSTOP, res);
- SetInfoText(res, FALSE);
+ SetInfoText(res, false);
Event newEvent = event;
newEvent.event = EVENT_OBJECT_PROGSTOP;
@@ -374,7 +374,7 @@ BOOL CStudio::EventFrame(const Event &event) if ( m_script->IsRunning() && !m_bRunning ) // starting?
{
- m_bRunning = TRUE;
+ m_bRunning = true;
UpdateFlux(); // run
AdjustEditScript();
}
@@ -411,13 +411,13 @@ BOOL CStudio::EventFrame(const Event &event) AdjustEditScript();
}
- return TRUE;
+ return true;
}
// Indicates whether a character is part of a word.
-BOOL IsToken(int character)
+bool IsToken(int character)
{
char c;
@@ -465,7 +465,7 @@ void CStudio::SearchToken(CEdit* edit) if ( level > 0 )
{
m_helpFilename[0] = 0;
- SetInfoText("", TRUE);
+ SetInfoText("", true);
return;
}
while ( i > 0 )
@@ -513,7 +513,7 @@ void CStudio::SearchToken(CEdit* edit) if ( strcmp(token, text) == 0 )
{
strcpy(m_helpFilename, RetHelpFilename(type));
- SetInfoText(token, TRUE);
+ SetInfoText(token, true);
return;
}
}
@@ -523,7 +523,7 @@ void CStudio::SearchToken(CEdit* edit) if ( strcmp(token, text) == 0 )
{
strcpy(m_helpFilename, RetHelpFilename(type));
- SetInfoText(token, TRUE);
+ SetInfoText(token, true);
return;
}
}
@@ -533,11 +533,11 @@ void CStudio::SearchToken(CEdit* edit) text = RetHelpText(token);
if ( text[0] == 0 && m_helpFilename[0] != 0 )
{
- SetInfoText(token, TRUE);
+ SetInfoText(token, true);
}
else
{
- SetInfoText(text, TRUE);
+ SetInfoText(text, true);
}
}
@@ -564,8 +564,8 @@ void CStudio::StartEditScript(CScript *script, char* name, int rank) m_script = script;
m_rank = rank;
- m_main->SetEditLock(TRUE, TRUE);
- m_main->SetEditFull(FALSE);
+ m_main->SetEditLock(true, true);
+ m_main->SetEditFull(false);
m_bInitPause = m_engine->RetPause();
m_main->SetSpeed(1.0f);
m_editCamera = m_camera->RetType();
@@ -586,9 +586,9 @@ void CStudio::StartEditScript(CScript *script, char* name, int rank) pw = m_interface->CreateWindows(pos, dim, 8, EVENT_WINDOW3);
if ( pw == 0 ) return;
pw->SetState(STATE_SHADOW);
- pw->SetRedim(TRUE); // before SetName!
- pw->SetMovable(TRUE);
- pw->SetClosable(TRUE);
+ pw->SetRedim(true); // before SetName!
+ pw->SetMovable(true);
+ pw->SetClosable(true);
GetResource(RES_TEXT, RT_STUDIO_TITLE, res);
pw->SetName(res);
pw->SetMinDim(FPOINT(0.49f, 0.50f));
@@ -599,12 +599,12 @@ void CStudio::StartEditScript(CScript *script, char* name, int rank) edit = pw->CreateEdit(pos, dim, 0, EVENT_STUDIO_EDIT);
if ( edit == 0 ) return;
edit->SetState(STATE_SHADOW);
- edit->SetInsideScroll(FALSE);
-//? if ( m_bRunning ) edit->SetEdit(FALSE);
+ edit->SetInsideScroll(false);
+//? if ( m_bRunning ) edit->SetEdit(false);
edit->SetMaxChar(EDITSTUDIOMAX);
edit->SetFontType(FONT_COURIER);
edit->SetFontStretch(0.7f);
- edit->SetDisplaySpec(TRUE);
+ edit->SetDisplaySpec(true);
edit->SetAutoIndent(m_engine->RetEditIndentMode());
m_script->PutScript(edit, name);
ColorizeScript(edit);
@@ -614,7 +614,7 @@ void CStudio::StartEditScript(CScript *script, char* name, int rank) list = pw->CreateList(pos, dim, 1, EVENT_STUDIO_LIST, 1.2f);
list->SetState(STATE_SHADOW);
list->SetFontType(FONT_COURIER);
- list->SetSelectCap(FALSE);
+ list->SetSelectCap(false);
list->SetFontSize(SMALLFONT*0.85f);
//? list->SetFontStretch(1.0f);
@@ -846,7 +846,7 @@ void CStudio::AdjustEditScript() // Ends edition of a program.
-BOOL CStudio::StopEditScript(BOOL bCancel)
+bool CStudio::StopEditScript(bool bCancel)
{
CWindow* pw;
CEdit* edit;
@@ -854,7 +854,7 @@ BOOL CStudio::StopEditScript(BOOL bCancel) char buffer[100];
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW3);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
if ( !bCancel && !m_script->IsRunning() )
{
@@ -864,12 +864,12 @@ BOOL CStudio::StopEditScript(BOOL bCancel) if ( !m_script->GetScript(edit) ) // compile
{
m_script->GetError(buffer);
- SetInfoText(buffer, FALSE);
- return FALSE;
+ SetInfoText(buffer, false);
+ return false;
}
}
}
- m_script->SetStepMode(FALSE);
+ m_script->SetStepMode(false);
m_interface->DeleteControl(EVENT_WINDOW3);
@@ -879,18 +879,18 @@ BOOL CStudio::StopEditScript(BOOL bCancel) button->SetState(STATE_VISIBLE);
}
- if ( !m_bInitPause ) m_engine->SetPause(FALSE);
- m_sound->MuteAll(FALSE);
- m_main->SetEditLock(FALSE, TRUE);
+ if ( !m_bInitPause ) m_engine->SetPause(false);
+ m_sound->MuteAll(false);
+ m_main->SetEditLock(false, true);
m_camera->SetType(m_editCamera);
- return TRUE;
+ return true;
}
// Specifies the message to display.
// The messages are not clickable 8 seconds,
// even if a message was clickable poster before.
-void CStudio::SetInfoText(char *text, BOOL bClickable)
+void CStudio::SetInfoText(char *text, bool bClickable)
{
CWindow* pw;
CList* list;
@@ -908,7 +908,7 @@ void CStudio::SetInfoText(char *text, BOOL bClickable) list->Flush(); // just text
list->SetName(0, text);
- if ( text[0] == 0 ) bClickable = FALSE;
+ if ( text[0] == 0 ) bClickable = false;
list->SetSelectCap(bClickable);
if ( bClickable )
@@ -954,23 +954,23 @@ void CStudio::UpdateFlux() #if 1
if ( m_bRealTime ) // run?
{
- m_engine->SetPause(FALSE);
- m_sound->MuteAll(FALSE);
+ m_engine->SetPause(false);
+ m_sound->MuteAll(false);
}
else // step by step?
{
- m_engine->SetPause(TRUE);
- m_sound->MuteAll(TRUE);
+ m_engine->SetPause(true);
+ m_sound->MuteAll(true);
}
#else
- m_engine->SetPause(FALSE);
- m_sound->MuteAll(FALSE);
+ m_engine->SetPause(false);
+ m_sound->MuteAll(false);
#endif
}
else // stop?
{
- m_engine->SetPause(TRUE);
- m_sound->MuteAll(TRUE);
+ m_engine->SetPause(true);
+ m_sound->MuteAll(true);
}
}
@@ -991,14 +991,14 @@ void CStudio::UpdateButtons() if ( m_bRunning )
{
edit->SetIcon(1); // red background
- edit->SetEditCap(FALSE); // just to see
- edit->SetHiliteCap(TRUE);
+ edit->SetEditCap(false); // just to see
+ edit->SetHiliteCap(true);
}
else
{
edit->SetIcon(0); // standard background
- edit->SetEditCap(TRUE);
- edit->SetHiliteCap(TRUE);
+ edit->SetEditCap(true);
+ edit->SetHiliteCap(true);
}
button = (CButton*)pw->SearchControl(EVENT_STUDIO_COMPILE);
@@ -1071,8 +1071,8 @@ void CStudio::StartDialog(StudioDialog type) //? pw = m_interface->CreateWindows(pos, dim, 8, EVENT_WINDOW9);
pw = m_interface->CreateWindows(pos, dim, m_dialog==SD_OPEN?14:13, EVENT_WINDOW9);
pw->SetState(STATE_SHADOW);
- pw->SetMovable(TRUE);
- pw->SetClosable(TRUE);
+ pw->SetMovable(true);
+ pw->SetClosable(true);
pw->SetMinDim(FPOINT(320.0f/640.0f, (121.0f+18.0f*4)/480.0f));
if ( m_dialog == SD_OPEN ) GetResource(RES_TEXT, RT_IO_OPEN, name);
if ( m_dialog == SD_SAVE ) GetResource(RES_TEXT, RT_IO_SAVE, name);
@@ -1139,10 +1139,10 @@ void CStudio::StartDialog(StudioDialog type) UpdateDialogAction();
pe->SetCursor(999, 0); // selects all
- pe->SetFocus(TRUE);
+ pe->SetFocus(true);
}
- m_main->SetSatComLock(TRUE); // impossible to use the SatCom
+ m_main->SetSatComLock(true); // impossible to use the SatCom
}
// End of the display of a dialogue.
@@ -1182,7 +1182,7 @@ void CStudio::StopDialog() if ( pw != 0 ) pw->SetState(STATE_ENABLE);
m_interface->DeleteControl(EVENT_WINDOW9);
- m_main->SetSatComLock(FALSE); // possible to use the SatCom
+ m_main->SetSatComLock(false); // possible to use the SatCom
}
// Adjust all controls of dialogue after a change in geometry.
@@ -1312,13 +1312,13 @@ void CStudio::AdjustDialog() // Management of the event of a dialogue.
-BOOL CStudio::EventDialog(const Event &event)
+bool CStudio::EventDialog(const Event &event)
{
CWindow* pw;
FPOINT wpos, wdim;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
if ( event.event == EVENT_WINDOW9 ) // window is moved?
{
@@ -1343,13 +1343,13 @@ BOOL CStudio::EventDialog(const Event &event) if ( event.event == EVENT_DIALOG_CHECK1 ) // private?
{
- m_main->SetIOPublic(FALSE);
+ m_main->SetIOPublic(false);
UpdateDialogPublic();
UpdateDialogList();
}
if ( event.event == EVENT_DIALOG_CHECK2 ) // public?
{
- m_main->SetIOPublic(TRUE);
+ m_main->SetIOPublic(true);
UpdateDialogPublic();
UpdateDialogList();
}
@@ -1360,15 +1360,15 @@ BOOL CStudio::EventDialog(const Event &event) {
if ( m_dialog == SD_OPEN )
{
- if ( !ReadProgram() ) return TRUE;
+ if ( !ReadProgram() ) return true;
}
if ( m_dialog == SD_SAVE )
{
- if ( !WriteProgram() ) return TRUE;
+ if ( !WriteProgram() ) return true;
}
StopDialog();
- return TRUE;
+ return true;
}
if ( event.event == EVENT_DIALOG_CANCEL ||
@@ -1376,10 +1376,10 @@ BOOL CStudio::EventDialog(const Event &event) event.event == pw->RetEventMsgClose() )
{
StopDialog();
- return TRUE;
+ return true;
}
- return TRUE;
+ return true;
}
// Updates the name after a click in the list.
@@ -1405,7 +1405,7 @@ void CStudio::UpdateChangeList() if ( p != 0 ) *p = 0;
pe->SetText(name);
pe->SetCursor(999, 0); // selects all
- pe->SetFocus(TRUE);
+ pe->SetFocus(true);
UpdateDialogAction();
}
@@ -1436,7 +1436,7 @@ void CStudio::UpdateDialogAction() CButton* pb;
char name[100];
int len, i;
- BOOL bError;
+ bool bError;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
if ( pw == 0 ) return;
@@ -1449,11 +1449,11 @@ void CStudio::UpdateDialogAction() len = strlen(name);
if ( len == 0 )
{
- bError = TRUE;
+ bError = true;
}
else
{
- bError = FALSE;
+ bError = false;
for ( i=0 ; i<len ; i++ )
{
if ( name[i] == '*' ||
@@ -1464,7 +1464,7 @@ void CStudio::UpdateDialogAction() name[i] == '"' ||
name[i] == '|' ||
name[i] == '/' ||
- name[i] == '\\' ) bError = TRUE;
+ name[i] == '\\' ) bError = true;
}
}
@@ -1501,9 +1501,9 @@ void CStudio::UpdateDialogPublic() if ( pl != 0 )
{
GetResource(RES_TEXT, RT_IO_LIST, name);
- SearchDirectory(dir, FALSE);
+ SearchDirectory(dir, false);
sprintf(text, name, dir);
- pl->SetName(text, FALSE);
+ pl->SetName(text, false);
}
}
@@ -1516,7 +1516,7 @@ void CStudio::UpdateDialogList() long hFile;
struct _finddata_t fileBuffer;
struct _finddata_t* listBuffer;
- BOOL bDo;
+ bool bDo;
char dir[_MAX_FNAME];
char temp[_MAX_FNAME];
int nbFilenames, i;
@@ -1530,7 +1530,7 @@ void CStudio::UpdateDialogList() nbFilenames = 0;
listBuffer = (_finddata_t*)malloc(sizeof(_finddata_t)*1000);
- SearchDirectory(dir, FALSE);
+ SearchDirectory(dir, false);
strcat(dir, "*"); // list all
hFile = _findfirst(dir, &fileBuffer);
if ( hFile != -1 )
@@ -1546,7 +1546,7 @@ void CStudio::UpdateDialogList() }
do // sorts all names:
{
- bDo = FALSE;
+ bDo = false;
for ( i=0 ; i<nbFilenames-1 ; i++ )
{
if ( strcmp(listBuffer[i].name, listBuffer[i+1].name) > 0 )
@@ -1554,7 +1554,7 @@ void CStudio::UpdateDialogList() fileBuffer = listBuffer[i]; // exchange i and i +1
listBuffer[i] = listBuffer[i+1];
listBuffer[i+1] = fileBuffer;
- bDo = TRUE;
+ bDo = true;
}
}
}
@@ -1573,7 +1573,7 @@ void CStudio::UpdateDialogList() // Constructs the name of the folder or open/save.
// If the folder does not exist, it will be created.
-void CStudio::SearchDirectory(char *dir, BOOL bCreate)
+void CStudio::SearchDirectory(char *dir, bool bCreate)
{
if ( m_main->RetIOPublic() )
{
@@ -1592,7 +1592,7 @@ void CStudio::SearchDirectory(char *dir, BOOL bCreate) // Reads a new program.
-BOOL CStudio::ReadProgram()
+bool CStudio::ReadProgram()
{
CWindow* pw;
CEdit* pe;
@@ -1601,36 +1601,36 @@ BOOL CStudio::ReadProgram() char* p;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
pe = (CEdit*)pw->SearchControl(EVENT_DIALOG_EDIT);
- if ( pe == 0 ) return FALSE;
+ if ( pe == 0 ) return false;
pe->GetText(filename, 100);
- if ( filename[0] == 0 ) return FALSE;
+ if ( filename[0] == 0 ) return false;
p = strstr(filename, ".txt");
if ( p == 0 || p != filename+strlen(filename)-4 )
{
strcat(filename, ".txt");
}
- SearchDirectory(dir, TRUE);
+ SearchDirectory(dir, true);
strcat(dir, filename);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW3);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
pe = (CEdit*)pw->SearchControl(EVENT_STUDIO_EDIT);
- if ( pe == 0 ) return FALSE;
+ if ( pe == 0 ) return false;
- if ( !pe->ReadText(dir) ) return FALSE;
+ if ( !pe->ReadText(dir) ) return false;
m_script->SetFilename(filename);
ColorizeScript(pe);
- return TRUE;
+ return true;
}
// Writes the current program.
-BOOL CStudio::WriteProgram()
+bool CStudio::WriteProgram()
{
CWindow* pw;
CEdit* pe;
@@ -1639,29 +1639,29 @@ BOOL CStudio::WriteProgram() char* p;
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
pe = (CEdit*)pw->SearchControl(EVENT_DIALOG_EDIT);
- if ( pe == 0 ) return FALSE;
+ if ( pe == 0 ) return false;
pe->GetText(filename, 100);
- if ( filename[0] == 0 ) return FALSE;
+ if ( filename[0] == 0 ) return false;
p = strstr(filename, ".txt");
if ( p == 0 || p != filename+strlen(filename)-4 )
{
strcat(filename, ".txt");
}
- SearchDirectory(dir, TRUE);
+ SearchDirectory(dir, true);
strcat(dir, filename);
pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW3);
- if ( pw == 0 ) return FALSE;
+ if ( pw == 0 ) return false;
pe = (CEdit*)pw->SearchControl(EVENT_STUDIO_EDIT);
- if ( pe == 0 ) return FALSE;
+ if ( pe == 0 ) return false;
- if ( !pe->WriteText(dir) ) return FALSE;
+ if ( !pe->WriteText(dir) ) return false;
m_script->SetFilename(filename);
- return TRUE;
+ return true;
}
diff --git a/src/ui/studio.h b/src/ui/studio.h index 4f88314..194ca64 100644 --- a/src/ui/studio.h +++ b/src/ui/studio.h @@ -53,17 +53,17 @@ public: CStudio(CInstanceManager* iMan);
~CStudio();
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void StartEditScript(CScript *script, char* name, int rank);
- BOOL StopEditScript(BOOL bCancel);
+ bool StopEditScript(bool bCancel);
protected:
- BOOL EventFrame(const Event &event);
+ bool EventFrame(const Event &event);
void SearchToken(CEdit* edit);
void ColorizeScript(CEdit* edit);
void AdjustEditScript();
- void SetInfoText(char *text, BOOL bClickable);
+ void SetInfoText(char *text, bool bClickable);
void ViewEditScript();
void UpdateFlux();
void UpdateButtons();
@@ -71,15 +71,15 @@ protected: void StartDialog(StudioDialog type);
void StopDialog();
void AdjustDialog();
- BOOL EventDialog(const Event &event);
+ bool EventDialog(const Event &event);
void UpdateChangeList();
void UpdateChangeEdit();
void UpdateDialogAction();
void UpdateDialogPublic();
void UpdateDialogList();
- void SearchDirectory(char *dir, BOOL bCreate);
- BOOL ReadProgram();
- BOOL WriteProgram();
+ void SearchDirectory(char *dir, bool bCreate);
+ bool ReadProgram();
+ bool WriteProgram();
protected:
CInstanceManager* m_iMan;
@@ -93,8 +93,8 @@ protected: int m_rank;
CScript* m_script;
- BOOL m_bEditMaximized;
- BOOL m_bEditMinimized;
+ bool m_bEditMaximized;
+ bool m_bEditMinimized;
CameraType m_editCamera;
FPOINT m_editActualPos;
@@ -104,9 +104,9 @@ protected: float m_time;
float m_fixInfoTextTime;
- BOOL m_bRunning;
- BOOL m_bRealTime;
- BOOL m_bInitPause;
+ bool m_bRunning;
+ bool m_bRealTime;
+ bool m_bInitPause;
char m_helpFilename[100];
StudioDialog m_dialog;
diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 1c138e0..4e282b9 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -52,23 +52,23 @@ CTarget::~CTarget() // Creates a new button.
-BOOL CTarget::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CTarget::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CTarget::EventProcess(const Event &event)
+bool CTarget::EventProcess(const Event &event)
{
#if 0
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
+ if ( m_state & STATE_DEAD ) return true;
CControl::EventProcess(event);
@@ -80,7 +80,7 @@ BOOL CTarget::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
@@ -93,22 +93,22 @@ BOOL CTarget::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = EVENT_OBJECT_FIRE;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
#else
CObject* pObj;
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
+ if ( m_state & STATE_DEAD ) return true;
CControl::EventProcess(event);
if ( event.event == EVENT_MOUSEMOVE )
{
- m_main->SetFriendAim(FALSE);
+ m_main->SetFriendAim(false);
if ( CControl::Detect(event.pos) )
{
@@ -120,11 +120,11 @@ BOOL CTarget::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
else
{
- m_main->SetFriendAim(TRUE);
+ m_main->SetFriendAim(true);
m_engine->SetMouseType(D3DMOUSENORM);
}
}
@@ -141,12 +141,12 @@ BOOL CTarget::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = EVENT_OBJECT_FIRE;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
}
- return TRUE;
+ return true;
#endif
}
@@ -161,20 +161,20 @@ void CTarget::Draw() // Returns the tooltip.
-BOOL CTarget::GetTooltip(FPOINT pos, char* name)
+bool CTarget::GetTooltip(FPOINT pos, char* name)
{
#if 0
if ( (m_state&STATE_VISIBLE) && Detect(pos) ) // in the window?
{
strcpy(name, m_tooltip);
- return TRUE; // does not detect objects below!
+ return true; // does not detect objects below!
}
- return FALSE;
+ return false;
#else
//? CObject* pObj;
- if ( (m_state & STATE_VISIBLE) == 0 ) return FALSE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return false;
if ( (m_state&STATE_VISIBLE) && Detect(pos) ) // in the window?
{
@@ -183,11 +183,11 @@ BOOL CTarget::GetTooltip(FPOINT pos, char* name) if ( !m_main->RetFriendAim() )
{
strcpy(name, m_tooltip);
- return TRUE; // does not detect objects below!
+ return true; // does not detect objects below!
}
}
- return FALSE;
+ return false;
#endif
}
diff --git a/src/ui/target.h b/src/ui/target.h index d34a9b4..7959c9a 100644 --- a/src/ui/target.h +++ b/src/ui/target.h @@ -33,11 +33,11 @@ public: CTarget(CInstanceManager* iMan);
~CTarget();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
- BOOL GetTooltip(FPOINT pos, char* name);
+ bool GetTooltip(FPOINT pos, char* name);
protected:
CObject* DetectFriendObject(FPOINT pos);
diff --git a/src/ui/window.cpp b/src/ui/window.cpp index 21fa17b..26e0a07 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -65,10 +65,10 @@ CWindow::CWindow(CInstanceManager* iMan) : CControl(iMan) m_table[i] = 0;
}
- m_bTrashEvent = TRUE;
- m_bMaximized = FALSE;
- m_bMinimized = FALSE;
- m_bFixed = FALSE;
+ m_bTrashEvent = true;
+ m_bMaximized = false;
+ m_bMinimized = false;
+ m_bFixed = false;
m_minDim = FPOINT(0.0f, 0.0f);
m_maxDim = FPOINT(1.0f, 1.0f);
@@ -77,10 +77,10 @@ CWindow::CWindow(CInstanceManager* iMan) : CControl(iMan) m_buttonFull = 0;
m_buttonClose = 0;
- m_bMovable = FALSE;
- m_bRedim = FALSE;
- m_bClosable = FALSE;
- m_bCapture = FALSE;
+ m_bMovable = false;
+ m_bRedim = false;
+ m_bClosable = false;
+ m_bCapture = false;
m_fontStretch = NORMSTRETCH*1.2f;
}
@@ -130,12 +130,12 @@ void CWindow::Flush() // Creates a new window.
-BOOL CWindow::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CWindow::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
- return TRUE;
+ return true;
}
@@ -535,7 +535,7 @@ CTarget* CWindow::CreateTarget(FPOINT pos, FPOINT dim, int icon, EventMsg eventM // Removes a control.
-BOOL CWindow::DeleteControl(EventMsg eventMsg)
+bool CWindow::DeleteControl(EventMsg eventMsg)
{
int i;
@@ -547,11 +547,11 @@ BOOL CWindow::DeleteControl(EventMsg eventMsg) {
delete m_table[i];
m_table[i] = 0;
- return TRUE;
+ return true;
}
}
}
- return FALSE;
+ return false;
}
// Gives a control.
@@ -576,7 +576,7 @@ CControl* CWindow::SearchControl(EventMsg eventMsg) // Makes the tooltip binds to the window.
-BOOL CWindow::GetTooltip(FPOINT pos, char* name)
+bool CWindow::GetTooltip(FPOINT pos, char* name)
{
int i;
@@ -586,7 +586,7 @@ BOOL CWindow::GetTooltip(FPOINT pos, char* name) {
if ( m_table[i]->GetTooltip(pos, name) )
{
- return TRUE;
+ return true;
}
}
}
@@ -594,26 +594,26 @@ BOOL CWindow::GetTooltip(FPOINT pos, char* name) if ( m_buttonClose != 0 &&
m_buttonClose->GetTooltip(pos, name) )
{
- return TRUE;
+ return true;
}
if ( m_buttonFull != 0 &&
m_buttonFull->GetTooltip(pos, name) )
{
- return TRUE;
+ return true;
}
if ( m_buttonReduce != 0 &&
m_buttonReduce->GetTooltip(pos, name) )
{
- return TRUE;
+ return true;
}
if ( Detect(pos) ) // in the window?
{
strcpy(name, m_tooltip);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
@@ -622,7 +622,7 @@ BOOL CWindow::GetTooltip(FPOINT pos, char* name) void CWindow::SetName(char* name)
{
CButton* pc;
- BOOL bAdjust;
+ bool bAdjust;
CControl::SetName(name);
@@ -644,7 +644,7 @@ void CWindow::SetName(char* name) m_buttonClose = 0;
}
- bAdjust = FALSE;
+ bAdjust = false;
if ( m_name[0] != 0 && m_bRedim ) // title bar exists?
{
@@ -656,7 +656,7 @@ void CWindow::SetName(char* name) pc = (CButton*)m_buttonFull;
pc->Create(m_pos, m_dim, 0, EVENT_NULL);
- bAdjust = TRUE;
+ bAdjust = true;
}
if ( m_name[0] != 0 && m_bClosable ) // title bar exists?
@@ -665,7 +665,7 @@ void CWindow::SetName(char* name) pc = (CButton*)m_buttonClose;
pc->Create(m_pos, m_dim, 0, EVENT_NULL);
- bAdjust = TRUE;
+ bAdjust = true;
}
if ( bAdjust )
@@ -757,12 +757,12 @@ FPOINT CWindow::RetMaxDim() // Indicates whether the window is moved.
-void CWindow::SetMovable(BOOL bMode)
+void CWindow::SetMovable(bool bMode)
{
m_bMovable = bMode;
}
-BOOL CWindow::RetMovable()
+bool CWindow::RetMovable()
{
return m_bMovable;
}
@@ -770,12 +770,12 @@ BOOL CWindow::RetMovable() // Management of the presence of minimize/maximize buttons.
-void CWindow::SetRedim(BOOL bMode)
+void CWindow::SetRedim(bool bMode)
{
m_bRedim = bMode;
}
-BOOL CWindow::RetRedim()
+bool CWindow::RetRedim()
{
return m_bRedim;
}
@@ -783,45 +783,45 @@ BOOL CWindow::RetRedim() // Management of the presence of the close button.
-void CWindow::SetClosable(BOOL bMode)
+void CWindow::SetClosable(bool bMode)
{
m_bClosable = bMode;
}
-BOOL CWindow::RetClosable()
+bool CWindow::RetClosable()
{
return m_bClosable;
}
-void CWindow::SetMaximized(BOOL bMaxi)
+void CWindow::SetMaximized(bool bMaxi)
{
m_bMaximized = bMaxi;
AdjustButtons();
}
-BOOL CWindow::RetMaximized()
+bool CWindow::RetMaximized()
{
return m_bMaximized;
}
-void CWindow::SetMinimized(BOOL bMini)
+void CWindow::SetMinimized(bool bMini)
{
m_bMinimized = bMini;
AdjustButtons();
}
-BOOL CWindow::RetMinimized()
+bool CWindow::RetMinimized()
{
return m_bMinimized;
}
-void CWindow::SetFixed(BOOL bFix)
+void CWindow::SetFixed(bool bFix)
{
m_bFixed = bFix;
}
-BOOL CWindow::RetFixed()
+bool CWindow::RetFixed()
{
return m_bFixed;
}
@@ -874,12 +874,12 @@ void CWindow::AdjustButtons() }
-void CWindow::SetTrashEvent(BOOL bTrash)
+void CWindow::SetTrashEvent(bool bTrash)
{
m_bTrashEvent = bTrash;
}
-BOOL CWindow::RetTrashEvent()
+bool CWindow::RetTrashEvent()
{
return m_bTrashEvent;
}
@@ -964,7 +964,7 @@ int CWindow::BorderDetect(FPOINT pos) // Management of an event.
-BOOL CWindow::EventProcess(const Event &event)
+bool CWindow::EventProcess(const Event &event)
{
FPOINT pos;
int i, flags;
@@ -1022,7 +1022,7 @@ BOOL CWindow::EventProcess(const Event &event) {
if ( !m_table[i]->EventProcess(event) )
{
- return FALSE;
+ return false;
}
}
}
@@ -1050,11 +1050,11 @@ BOOL CWindow::EventProcess(const Event &event) m_pressFlags = BorderDetect(event.pos);
if ( m_pressFlags != 0 )
{
- m_bCapture = TRUE;
+ m_bCapture = true;
m_pressPos = event.pos;
}
}
- return FALSE;
+ return false;
}
}
@@ -1113,10 +1113,10 @@ BOOL CWindow::EventProcess(const Event &event) if ( event.event == EVENT_LBUTTONUP && m_bCapture )
{
- m_bCapture = FALSE;
+ m_bCapture = false;
}
- return TRUE;
+ return true;
}
@@ -1582,7 +1582,7 @@ void CWindow::DrawHach(FPOINT pos, FPOINT dim) #else
FPOINT ppos, ddim, uv1, uv2;
float dp, max, ndim;
- BOOL bStop;
+ bool bStop;
dp = 0.5f/256.0f;
@@ -1601,7 +1601,7 @@ void CWindow::DrawHach(FPOINT pos, FPOINT dim) ppos = pos;
ddim = dim;
- bStop = FALSE;
+ bStop = false;
do
{
ddim.x = max;
@@ -1610,7 +1610,7 @@ void CWindow::DrawHach(FPOINT pos, FPOINT dim) ndim = pos.x+dim.x-ppos.x;
uv2.x = uv1.x+(uv2.x-uv1.x)*(ndim/ddim.x);
ddim.x = ndim;
- bStop = TRUE;
+ bStop = true;
}
DrawIcon(ppos, ddim, uv1, uv2);
diff --git a/src/ui/window.h b/src/ui/window.h index d88ba33..86ae6f2 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -52,7 +52,7 @@ public: ~CWindow();
void Flush();
- BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
CButton* CreateButton(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
CColor* CreateColor(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
CCheck* CreateCheck(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
@@ -70,7 +70,7 @@ public: CGauge* CreateGauge(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
CCompass* CreateCompass(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
CTarget* CreateTarget(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
- BOOL DeleteControl(EventMsg eventMsg);
+ bool DeleteControl(EventMsg eventMsg);
CControl* SearchControl(EventMsg eventMsg);
EventMsg RetEventMsgReduce();
@@ -79,8 +79,8 @@ public: void SetName(char* name);
- void SetTrashEvent(BOOL bTrash);
- BOOL RetTrashEvent();
+ void SetTrashEvent(bool bTrash);
+ bool RetTrashEvent();
void SetPos(FPOINT pos);
void SetDim(FPOINT dim);
@@ -90,25 +90,25 @@ public: FPOINT RetMinDim();
FPOINT RetMaxDim();
- void SetMovable(BOOL bMode);
- BOOL RetMovable();
+ void SetMovable(bool bMode);
+ bool RetMovable();
- void SetRedim(BOOL bMode);
- BOOL RetRedim();
+ void SetRedim(bool bMode);
+ bool RetRedim();
- void SetClosable(BOOL bMode);
- BOOL RetClosable();
+ void SetClosable(bool bMode);
+ bool RetClosable();
- void SetMaximized(BOOL bMaxi);
- BOOL RetMaximized();
- void SetMinimized(BOOL bMini);
- BOOL RetMinimized();
- void SetFixed(BOOL bFix);
- BOOL RetFixed();
+ void SetMaximized(bool bMaxi);
+ bool RetMaximized();
+ void SetMinimized(bool bMini);
+ bool RetMinimized();
+ void SetFixed(bool bFix);
+ bool RetFixed();
- BOOL GetTooltip(FPOINT pos, char* name);
+ bool GetTooltip(FPOINT pos, char* name);
- BOOL EventProcess(const Event &event);
+ bool EventProcess(const Event &event);
void Draw();
@@ -122,10 +122,10 @@ protected: protected:
CControl* m_table[MAXWINDOW];
- BOOL m_bTrashEvent;
- BOOL m_bMaximized;
- BOOL m_bMinimized;
- BOOL m_bFixed;
+ bool m_bTrashEvent;
+ bool m_bMaximized;
+ bool m_bMinimized;
+ bool m_bFixed;
FPOINT m_minDim;
FPOINT m_maxDim;
@@ -134,10 +134,10 @@ protected: CButton* m_buttonFull;
CButton* m_buttonClose;
- BOOL m_bMovable;
- BOOL m_bRedim;
- BOOL m_bClosable;
- BOOL m_bCapture;
+ bool m_bMovable;
+ bool m_bRedim;
+ bool m_bClosable;
+ bool m_bCapture;
FPOINT m_pressPos;
int m_pressFlags;
D3DMouse m_pressMouse;
|