diff --git a/Gameleap/code/CoreTech/Code/GosView1/GosTracePane.cpp b/Gameleap/code/CoreTech/Code/GosView1/GosTracePane.cpp index d122686d..8b85e810 100644 --- a/Gameleap/code/CoreTech/Code/GosView1/GosTracePane.cpp +++ b/Gameleap/code/CoreTech/Code/GosView1/GosTracePane.cpp @@ -104,7 +104,7 @@ char *TimeToString( double secs ) else if( secs*1000000.f >= 1.0f ) { - sprintf(TimeStr,"%.2f µS", secs*1000000.f); + sprintf(TimeStr,"%.2f us", secs*1000000.f); } else { diff --git a/Gameleap/code/CoreTech/Code/GosView1/ZoomDialog.cpp b/Gameleap/code/CoreTech/Code/GosView1/ZoomDialog.cpp index 33ab8320..1edb0038 100644 --- a/Gameleap/code/CoreTech/Code/GosView1/ZoomDialog.cpp +++ b/Gameleap/code/CoreTech/Code/GosView1/ZoomDialog.cpp @@ -24,9 +24,9 @@ const char *DivStrings[] = "1nS / div", // 10^-9 "10nS / div", // 10^-8 "100nS / div", - "1µS / div", - "10µS / div", - "100µS / div", + "1us / div", + "10us / div", + "100us / div", "1mS / div", "10mS / div", "100mS / div", diff --git a/Gameleap/code/CoreTech/Code/GosView2/GosTracePane.cpp b/Gameleap/code/CoreTech/Code/GosView2/GosTracePane.cpp index d122686d..8b85e810 100644 --- a/Gameleap/code/CoreTech/Code/GosView2/GosTracePane.cpp +++ b/Gameleap/code/CoreTech/Code/GosView2/GosTracePane.cpp @@ -104,7 +104,7 @@ char *TimeToString( double secs ) else if( secs*1000000.f >= 1.0f ) { - sprintf(TimeStr,"%.2f µS", secs*1000000.f); + sprintf(TimeStr,"%.2f us", secs*1000000.f); } else { diff --git a/Gameleap/code/CoreTech/Code/GosView2/ZoomDialog.cpp b/Gameleap/code/CoreTech/Code/GosView2/ZoomDialog.cpp index 33ab8320..1edb0038 100644 --- a/Gameleap/code/CoreTech/Code/GosView2/ZoomDialog.cpp +++ b/Gameleap/code/CoreTech/Code/GosView2/ZoomDialog.cpp @@ -24,9 +24,9 @@ const char *DivStrings[] = "1nS / div", // 10^-9 "10nS / div", // 10^-8 "100nS / div", - "1µS / div", - "10µS / div", - "100µS / div", + "1us / div", + "10us / div", + "100us / div", "1mS / div", "10mS / div", "100mS / div", diff --git a/Gameleap/code/CoreTech/Libraries/GameOS/3DRasterizer.cpp b/Gameleap/code/CoreTech/Libraries/GameOS/3DRasterizer.cpp index 13f25c68..6f29fc2b 100644 --- a/Gameleap/code/CoreTech/Libraries/GameOS/3DRasterizer.cpp +++ b/Gameleap/code/CoreTech/Libraries/GameOS/3DRasterizer.cpp @@ -1032,19 +1032,19 @@ void __stdcall gos_SetViewport( DWORD LeftX, DWORD TopY, DWORD Width, DWORD Heig // You can only clear the backbuffer or Z buffer on the FIRST setup viewport (outside the Begin/End Scene // -//»óÈÆ ¾Õ +//sanghoon begin void __cdecl ClearTargetCameraBackBuffer() { D3DRECT rc={0,10,120,112}; wClear(d3dDevice7,1,&rc,D3DCLEAR_TARGET,0xFF00FFFF,0,0); return ; } -//»óÈÆ µÚ +//sanghoon end void __stdcall gos_SetupViewport( bool FillZ, float ZBuffer, bool FillBG, DWORD BGColor, float top, float left, float bottom, float right, bool ClearStencil, DWORD StencilValue ) { - //»óÈƯ... - //¿ø·¡ÀÇ ¹ýÄ¢¿¡ ¾î±ß³ª´Â ÇൿÀ̱⠶§¹®¿¡ ASSERT¸¦ ¹«½ÃÇÑ´Ù. + //sanghoon + //This violates the normal rules, so we suppress the ASSERT. //gosASSERT( !InsideBeginScene || !(FillZ || FillBG) ); // // Work out size of viewport diff --git a/Gameleap/code/CoreTech/Libraries/GameOS/ControlManager.cpp b/Gameleap/code/CoreTech/Libraries/GameOS/ControlManager.cpp index 62359edf..c0824dce 100644 --- a/Gameleap/code/CoreTech/Libraries/GameOS/ControlManager.cpp +++ b/Gameleap/code/CoreTech/Libraries/GameOS/ControlManager.cpp @@ -47,11 +47,11 @@ extern DWORD gDisableJoystick; bool DisablePolling=0; void CMRestoreEffects( int stick ); -// úè - start +// hyun begin int g_bUseOrgJoy = TRUE; void (__stdcall *g_pfnRIO_Joy)(DIJOYSTATE& js) = NULL; // Check out Test .. bool g_bNoWeaponRangeCheck = false; -// úè - end +// hyun end // // // Initialize the DirectInput devices @@ -479,7 +479,7 @@ extern DWORD EnableDisplayInfo; if( EnableDisplayInfo==0 ) { disp: - sprintf(DisplayInfoText, "COIN: %d ÄÚÀÎÀÌ·¡¿ä", g_nCoinCount); + sprintf(DisplayInfoText, "COIN: %d coins", g_nCoinCount); EnableDisplayInfo = 1; } else if (EnableDisplayInfo==2) { if( timeGetTime() < EndDisplayInfoTime+50 ) { diff --git a/Gameleap/code/CoreTech/Libraries/GameOS/DXRasterizer.cpp b/Gameleap/code/CoreTech/Libraries/GameOS/DXRasterizer.cpp index ee211377..20feaab1 100644 --- a/Gameleap/code/CoreTech/Libraries/GameOS/DXRasterizer.cpp +++ b/Gameleap/code/CoreTech/Libraries/GameOS/DXRasterizer.cpp @@ -100,11 +100,11 @@ IDirectDraw7* DDobject = NULL; // Primiary DirectDraw object (for persistant IDirectDraw7* CurrentDDobject = NULL; // DirectDraw object for rendering (can be the same as DDObject) IDirectDrawSurface7* ZBufferSurface = NULL; // ZBuffer surface IDirectDrawSurface7* RefZBufferSurface = NULL; // Referemce rasterizer ZBuffer surface -//���� �� +//sanghoon marker IDirectDrawSurface7* SH_TargetBufferSurface = NULL; IDirectDrawSurface7* SH_SwirlTexture= NULL; IDirectDrawSurface7* SH_GameEndTexture= NULL; -//���� �� +//sanghoon marker DDSURFACEDESC2 BackBufferddsd; // @@ -167,7 +167,7 @@ float GammaSetting=0.0; bool UseGammaCorrection=0; float UserGamma=1.0f; -//����¯-begin +//sanghoon begin bool use_shgui = false; bool hsh_initialized=false; bool hsh_mrdev_initialized=false; @@ -176,7 +176,7 @@ bool hsh_mrdev_initialized=false; #include "coord.cpp" //#include "hsh_dxras.cpp" #include "render.hpp" -//����¯-end +//sanghoon end // // Value range 0-10,000, default 750 (See DirectX docs) @@ -1021,11 +1021,11 @@ void EnterFullScreenMode() // #ifdef LAB_ONLY - //����¯ + //sanghoon wSetCooperativeLevel( CurrentDDobject, hWindow, DDSCL_SETFOCUSWINDOW ); wSetCooperativeLevel( CurrentDDobject, hWindow, DDSCL_ALLOWREBOOT | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN ); #else - //����¯ + //sanghoon wSetCooperativeLevel( CurrentDDobject, hWindow, DDSCL_SETFOCUSWINDOW ); wSetCooperativeLevel( CurrentDDobject, hWindow, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN ); #endif @@ -1127,11 +1127,11 @@ void EnterFullScreenMode() } } -//����¯-begin +//sanghoon begin if(use_shgui){ HSH_EnterFullScreen2(); } -//����¯-end +//sanghoon end // // Changed modes, create all the surfaces @@ -1164,7 +1164,7 @@ void EnterFullScreenMode() // Debugging information // SPEW(( GROUP_DIRECTDRAW, "EnterFullScreenMode() Finished" )); -//���� +//sanghoon } @@ -1289,7 +1289,7 @@ void DisplayBackBuffer() else { #if 0 - //���� �� + //sanghoon marker extern bool sh_game_started; static FILE* fp=0; static recorded_count=0; @@ -1352,11 +1352,11 @@ extern bool sh_game_started; pp=(double*)malloc(800*600*2); } } - //���� �� + //sanghoon marker #endif wFlip( FrontBufferSurface,NULL,DDFLIP_DONOTWAIT );//|DDFLIP_INTERVAL2 ); - //���� ��ħ.. - //���� + //sanghoon marker.. + //sanghoon //wFlip( FrontBufferSurface,NULL,DDFLIP_WAIT ); } } @@ -1403,11 +1403,11 @@ extern bool sh_game_started; // void DirectDrawRelease() { -//����¯-begin +//sanghoon begin if(use_shgui){ HSH_DirectDrawRelease2(); } -//����¯-end +//sanghoon end SPEW(( GROUP_DIRECTDRAW, "DirectDrawRelease()" )); SafeFPU(); @@ -1496,7 +1496,7 @@ void DirectDrawRelease() wRelease( ZBufferSurface ); ZBufferSurface=0; } - //���� �� + //sanghoon marker //DirectDrawRelease if( SH_TargetBufferSurface) { @@ -1513,7 +1513,7 @@ void DirectDrawRelease() wRelease( SH_GameEndTexture ); SH_GameEndTexture=0; } - //���� �� + //sanghoon marker if( GammaControlInterface ) { wRelease( GammaControlInterface ); @@ -1593,20 +1593,20 @@ void DirectDrawCreateDDObject() // // Create the NULL (primary) DirectDraw object // - //���� �� + //sanghoon marker /* wDirectDrawCreateEx( &DeviceArray[0].DeviceGUID, (void**)&DDobject, IID_IDirectDraw7, NULL ); // wDirectDrawCreateEx( &DeviceArray[Environment.FullScreenDevice].DeviceGUID, (void**)&DDobject, IID_IDirectDraw7, NULL ); wSetCooperativeLevel( DDobject, hWindow, DDSCL_NORMAL ); CurrentDDobject=DDobject; */ - //���� �ҽ�.. + //sanghoon .. //wDirectDrawCreateEx(&DeviceArray[0].DeviceGUID, (void**)&DDobject, IID_IDirectDraw7, NULL ); wDirectDrawCreateEx(NULL, (void**)&DDobject, IID_IDirectDraw7, NULL ); wSetCooperativeLevel( DDobject, hWindow, DDSCL_NORMAL ); CurrentDDobject=DDobject; - //���� �� + //sanghoon marker // // // @@ -1630,11 +1630,11 @@ bool SetupMode( bool FullScreen, DWORD Renderer ) BackBufferSurface=0; ClipperObject=0; ZBufferSurface=0; - //���� �� + //sanghoon marker SH_TargetBufferSurface = 0; SH_SwirlTexture=0; SH_GameEndTexture=0; - //���� �� + //sanghoon marker Maind3dDevice7=0; d3dDevice7=0; DDSURFACEDESC2 ddsd; @@ -1993,7 +1993,7 @@ bool SetupMode( bool FullScreen, DWORD Renderer ) } wAddAttachedSurface( BackBufferSurface, ZBufferSurface ); - //���� �� + //sanghoon marker { DDSURFACEDESC2 rdesc; memset(&rdesc,0,sizeof(ddsd)); @@ -2019,7 +2019,7 @@ bool SetupMode( bool FullScreen, DWORD Renderer ) if(SUCCEEDED(wCreateSurface( CurrentDDobject, &rdesc, &SH_SwirlTexture, NULL ))){ ; - //ȭ�鿡 �ؽ��� ������ ����. + //Draw texture content to screen. . } rdesc.dwFlags = DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_TEXTURESTAGE; @@ -2031,11 +2031,11 @@ bool SetupMode( bool FullScreen, DWORD Renderer ) if(SUCCEEDED(wCreateSurface( CurrentDDobject, &rdesc, &SH_GameEndTexture, NULL ))){ ; - //ȭ�鿡 �ؽ��� ������ ����. + //Draw texture content to screen. . } } - //���� �� + //sanghoon marker // // Get the Z buffer pixel format (nVidia may always match front bit depth) // @@ -2258,7 +2258,7 @@ Failed: wRelease( ZBufferSurface ); ZBufferSurface=0; } - //���� + //sanghoon //SetupMode if( SH_TargetBufferSurface) { @@ -2275,7 +2275,7 @@ Failed: wRelease( SH_SwirlTexture ); SH_SwirlTexture=0; } - //���� + //sanghoon if( ClipperObject ) { if( FrontBufferSurface ) @@ -2578,7 +2578,7 @@ void DirectDrawCreateAllBuffers() wRelease( ZBufferSurface ); ZBufferSurface=0; } - //���� �� + //sanghoon marker //DirectDrawCreateAllBuffers if( SH_TargetBufferSurface) { @@ -2595,7 +2595,7 @@ void DirectDrawCreateAllBuffers() wRelease( SH_SwirlTexture ); SH_SwirlTexture=0; } - //���� �� + //sanghoon marker if( ClipperObject ) { if( FrontBufferSurface ) diff --git a/Gameleap/code/CoreTech/Libraries/GameOS/Direct3D.cpp b/Gameleap/code/CoreTech/Libraries/GameOS/Direct3D.cpp index ede829c6..c2f41ea3 100644 --- a/Gameleap/code/CoreTech/Libraries/GameOS/Direct3D.cpp +++ b/Gameleap/code/CoreTech/Libraries/GameOS/Direct3D.cpp @@ -161,7 +161,7 @@ HRESULT wEndScene( IDirect3DDevice7* d3dDevice7 ) //Original //if( FAILED(result) ) - //»óÈÆ + //sanghoon if( FAILED(result) && result!=DDERR_SURFACELOST) PAUSE(( "FAILED (0x%x - %s) - EndScene()",result,ErrorNumberToMessage(result))); diff --git a/Gameleap/code/CoreTech/Libraries/GameOS/WinMain.cpp b/Gameleap/code/CoreTech/Libraries/GameOS/WinMain.cpp index f10f4679..b60b5435 100644 --- a/Gameleap/code/CoreTech/Libraries/GameOS/WinMain.cpp +++ b/Gameleap/code/CoreTech/Libraries/GameOS/WinMain.cpp @@ -834,11 +834,11 @@ __int64 ProfileRenderEnd( __int64 RenderTime ) } -//»óÈƯ begin +//sanghoon begin #include "render.hpp" HRESULT App_Render( LPDIRECT3DDEVICE7 pd3dDevice,LPDIRECTDRAWSURFACE7 pddsTexture); -//»óÈƯ end +//sanghoon end // @@ -915,8 +915,8 @@ void gos_UpdateDisplay( bool Everything ) ProfileTime( TimeClearViewPort, gos_SetupViewport( 0, 0, 1, 0x303050 , 0.0, 0.0, 1.0, 1.0 ) ); TimeInClearViewPort+=TimeClearViewPort; } - //»óÈƯ begin - //backbuffer¿¡ Background Image¸¦ ±×¸°´Ù... + //sanghoon begin + //Draw background image to backbuffer... if(hsh_initialized){ // 0 - no MFDs, 1 - orginal(5+1=dual & single), 2 - B&W(3 + 1=1 dual), 3 - color(3 + 1=2 dual) @@ -958,7 +958,7 @@ void gos_UpdateDisplay( bool Everything ) } //HSH_RenderAux1SmallMech(); - //»óÈƯ end + //sanghoon end if (g_pfnCTCL_AfterBeginScene) { (*g_pfnCTCL_AfterBeginScene)(); } @@ -1055,7 +1055,7 @@ void gos_UpdateDisplay( bool Everything ) LOG_BLOCK("Gos::UpdateDebugger()"); ProfileTime( TimeDebugger, UpdateDebugger() ); } - //»óÈÆ.. + //sanghoon #if 1 extern LPDIRECT3DDEVICE7 d3dDevice7; static bool preload_GameEndScreem=true;; @@ -1089,8 +1089,8 @@ void gos_UpdateDisplay( bool Everything ) // // Flip or Blit the current image onto the display // - //»óÈÆ ¾Õ - //FlipÀ» ÇÑ´Ù. + //sanghoon begin + //Perform the Flip. if(hsh_initialized){ // 0 - no MFDs, 1 - orginal(5+1=dual & single), 2 - B&W(3 + 1=1 dual), 3 - color(3 + 1=2 dual) switch(g_nTypeOfMFDs) { @@ -1143,7 +1143,7 @@ void gos_UpdateDisplay( bool Everything ) mr_device.pDDSFront->Flip(0,DDFLIP_DONOTWAIT|DDFLIP_NOVSYNC); } - //»óÈÆ µÚ + //sanghoon end { LOG_BLOCK("Gos::DisplayBackBuffer()"); ProfileTime( TimeDisplay, DisplayBackBuffer() ); diff --git a/Gameleap/code/CoreTech/Libraries/GameOS/WinProc.cpp b/Gameleap/code/CoreTech/Libraries/GameOS/WinProc.cpp index b2bb9b62..cfd7f333 100644 --- a/Gameleap/code/CoreTech/Libraries/GameOS/WinProc.cpp +++ b/Gameleap/code/CoreTech/Libraries/GameOS/WinProc.cpp @@ -44,9 +44,9 @@ extern DWORD gNumLockMode; extern DWORD gCapLockMode; extern DWORD gScrollLockMode; -// úè - start +// hyun begin void (__stdcall *g_pfnRIO_ButtonEvent)(BYTE* by) = NULL; -// úè - end +// hyun end // // @@ -106,14 +106,14 @@ LRESULT CALLBACK GameOSWinProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar switch( uMsg ) { - // úè + // hyun case WM_USER + 100: { - // úè - start + // hyun begin if (g_pfnRIO_ButtonEvent) { (*g_pfnRIO_ButtonEvent)((BYTE*)&lParam); } - // úè - end + // hyun end } break; // diff --git a/Gameleap/code/CoreTech/Libraries/GameOS/render.cpp b/Gameleap/code/CoreTech/Libraries/GameOS/render.cpp index 13c8ce81..841e403b 100644 --- a/Gameleap/code/CoreTech/Libraries/GameOS/render.cpp +++ b/Gameleap/code/CoreTech/Libraries/GameOS/render.cpp @@ -163,13 +163,13 @@ static bool IsValidAlphaPair( DIBSECTION& dib,DIBSECTION& diba) if(dib.dsBmih.biHeight<0 || diba.dsBmih.biHeight<0)return false; - //Çȼ¿ Æ÷¸ËÀ» ÀÏ´Ü ¸¸Á·Çϴ°¡? + //Does it satisfy the pixel format requirement? if(!(bm.bmBitsPixel==24 && bma.bmBitsPixel==8))return false; - //ºñÆ®¸ÊÀÇ Å©±â°¡ X,Y¸ðµÎ 2ÀÇ Áö¼ö½ÂÀΰ¡? + //Are the bitmap dimensions (X,Y) both powers of 2? if(!(IsTextureDimension(w) && IsTextureDimension(h)))return false; - //RGB¿Í AºñÆ®¸ÊÀÇ Å©±â°¡ °°Àº°¡? + //Are RGB and Alpha bitmaps the same size? if(bma.bmWidth!=w || bma.bmHeight!=h)return NULL; return true; @@ -408,7 +408,7 @@ bool __cdecl DrawBitmapToSurface(LPDIRECTDRAWSURFACE7 pddsTexture,int x,int y,co -//8Bit BitmapÀ¸·ÎºÎÅÍ.. Alpha¸¦ °¡Áø ÅؽºÃĸ¦ ¸¸µç´Ù. +//Create texture with Alpha from 8-bit Bitmap.. static LPDIRECTDRAWSURFACE7 CreateATextureFromBitmap(LPDIRECTDRAW7 pDD,HBITMAP hbm ) { BITMAP bm={0,}; @@ -442,7 +442,7 @@ static LPDIRECTDRAWSURFACE7 CreateATextureFromBitmap(LPDIRECTDRAW7 pDD,HBITMAP h LPDIRECTDRAWSURFACE7 CreateATextureFromFile(LPDIRECTDRAW7 pDD, CHAR* strName ) { - //ClipBoard.¿¡ ÅؽºÆ® ³»¿ëÀ» º¹»çÇÑ´Ù... + //Copy text content to Clipboard... /* OpenClipboard(hWindow); HGLOBAL h=GlobalAlloc(GMEM_MOVEABLE,512); @@ -531,7 +531,7 @@ bool CHSH_Device::InitFirst(int devicenum,DWORD resx,DWORD resy, CHSH_Device* pO pDD = pOtherHSHD->pDD; } else { HRESULT hr; - //1. ÇØ»óµµ º¯°æ. + //1. Resolution change. wDirectDrawCreateEx( &DeviceArray[devicenum].DeviceGUID , (VOID**) &(pDD), IID_IDirectDraw7, NULL ); pDD->SetCooperativeLevel(hWindow, dwFlags ); hr=pDD->SetDisplayMode( resx, resy, 16, 60, 0 ); @@ -846,10 +846,10 @@ void CHSH_Device::DrawThickFrameList(int framecount,RECT* prc,int t,DWORD dwColo } -//texture ÁÂÇ¥.. u1,v1,u2,v2 -//texture ȸÀüÃà tx,ty -//screen ȸÀüÃà x,y -//ȸÀü°¢ e +//Texture coordinates.. u1,v1,u2,v2 +//Texture rotation axis tx,ty +//Screen rotation axis x,y +//Rotation angle e void CHSH_Device::DrawTextureRotate(float u1,float v1,float u2,float v2,float tx,float ty,float x,float y,float e,DWORD color) { @@ -858,9 +858,9 @@ void CHSH_Device::DrawTextureRotate(float u1,float v1,float u2,float v2,float tx float U2=u2-tx; float V2=v2-ty; - //(U1,V1),(U2,V1),(U1,V2),(U2,V2)³×½ÖÀ» ȸÀüº¯È¯ ½ÃŲ´Ù. + //(U1,V1),(U2,V1),(U1,V2),(U2,V2) four pairs are rotation-transformed. //pt[0][0].... - //°Å±â¿¡.. °¢ Ãà¿¡..x,y¸¦ ´õÇØÁØ´Ù. + //Add x,y to each axis. float cose=cosf(e); float cos_u1=cose*U1; float cos_u2=cose*U2; @@ -883,11 +883,11 @@ void CHSH_Device::DrawTextureRotate(float u1,float v1,float u2,float v2,float tx pt[3][1] = sin_u2+cos_v2+y; //HSH_Draw3DTexture2(0,pt,0xFF00FF00,u1, v1/256.0f, u2/256.0f, v2/256.0f); - //°Å±â¿¡´Ù°¡ ¸ðµÎ x,y¸¦ ´Ù½Ã À̵¿ ½ÃŲ´Ù. + //Then translate all by x,y again. DrawTexture(pt,color,u1,v1,u2,v2); } -//ÀÓÀÇ·Î ½ºÄÉÀϵȴÙ. x1,y1,x2,y2 +//Scaled arbitrarily. x1,y1,x2,y2 void CHSH_Device::DrawTexture(float x1,float y1,float x2,float y2,DWORD dwColor, float u1,float v1,float u2,float v2) { @@ -900,7 +900,7 @@ void CHSH_Device::DrawTexture(float x1,float y1,float x2,float y2,DWORD dwColor, pD3DDevice->DrawPrimitive( D3DPT_TRIANGLESTRIP, D3DFVF_TLVERTEX ,v,4,0 ); } -//ÀÓÀÇ·Î ½ºÄÉÀϵȴÙ. x,y,width,height +//Scaled arbitrarily. x,y,width,height void CHSH_Device::DrawTexture2(float x,float y,float w,float h,DWORD dwColor, float u1,float v1,float u2,float v2) { @@ -914,7 +914,7 @@ void CHSH_Device::DrawTexture2(float x,float y,float w,float h,DWORD dwColor, fl } -//½ºÄÉÀÏ µÇÁö ¾Ê´Â.... +//Not scaled.... void CHSH_Device::DrawTexture(float x,float y,DWORD dwColor, float u1,float v1,float u2,float v2) { D3DTLVERTEX v[4]; @@ -978,11 +978,11 @@ bool CMR_Device::InitFirst() bool CMR_Device::InitSecond() { map_loaded=false; - CHSH_Device::InitSecond(0,0); // no off screen - Target Texture¸¦ ±×¸®Áö ¾Ê´Â´Ù. + CHSH_Device::InitSecond(0,0); // no off screen - do not create Target Texture. char temppath[MAX_PATH],temppatha[MAX_PATH]; - //1. ¹é±×¶ó¿îµåÀ̹ÌÁö¿ë Surface + //1. Surface for background image sprintf(temppath,"%s\\hsh\\%s",AssetsDirectory1,"mr_background.bmp"); pDDSBackground=CreateSurfaceFromFile(pDD,temppath); @@ -990,12 +990,12 @@ bool CMR_Device::InitSecond() MessageBeep(0); } - //2. ¹ü¿ë ÅؽºÃÄ + //2. General-purpose texture sprintf(temppath,"%s\\hsh\\%s",AssetsDirectory1,"mr_texture.bmp"); sprintf(temppatha,"%s\\hsh\\%s",AssetsDirectory1,"mr_texturea.bmp"); pDDSTexture=CreateRGBATextureFromFile(pDD, temppath,temppatha,16); - //3. ¸Ê¿ë ÅؽºÃÄ.. + //3. Texture for map.. pDDSMapTexture=CreatePixelFormatTexture(pDD,256,256,&DDPF_R5G6B5); tw=256; @@ -1008,17 +1008,17 @@ bool CMR_Device::InitSecond() bool CMR_Device::BeginScene() { - //Render TargetÀ» ¼³Á¤ÇÑ´Ù. + //Set the Render Target. //SetRenderTargetTexture(); - //Texture¿¡.. background image¸¦ ±×¸°´Ù. ÀÏÁ¾ÀÇ Clear´ë½ÅÀÌ´Ù.. + //Draw background image to Texture. Used as a substitute for Clear.. if(sh_game_started){ - //°ÔÀÓÀÌ ½ÃÀ۵ǾúÀ»¶§¸¸ ¹é±×¶ó¿îµå¸¦ ±×¸°´Ù. + //Draw background only when game has started. RECT rc={0,0,640,480}; pDDSBack->BltFast(0,0,pDDSBackground,&rc,0); }else{ - //°ÔÀÓÀÌ ½ÃÀÛµÇÁö ¾Ê¾ÒÀ¸¸é.. blank¸¦ º¸¿©ÁØ´Ù. + //If game has not started.. show blank. pD3DDevice->Clear(0,NULL,D3DCLEAR_TARGET ,0,1.0f,0); } @@ -1171,18 +1171,18 @@ bool CRadar_Device::InitSecond() bool CRadar_Device::BeginScene() { - //Render TargetÀ» ¼³Á¤ÇÑ´Ù. + //Set the Render Target. SetRenderTargetTexture(); - //Texture¿¡.. background image¸¦ ±×¸°´Ù. ÀÏÁ¾ÀÇ Clear´ë½ÅÀÌ´Ù.. + //Draw background image to Texture. Used as a substitute for Clear.. if(sh_game_started){ - //°ÔÀÓÀÌ ½ÃÀ۵ǾúÀ»¶§¸¸ ¹é±×¶ó¿îµå¸¦ ±×¸°´Ù. + //Draw background only when game has started. RECT rc={0,0,480,640}; pDDSTarget->BltFast(0,0,pDDSBackground,&rc,0); if(IsMechShutdown()) { - //Áöµµ ¿µ¿ªÀ» Áö¿î´Ù. + //Clear map area. RECT rc={140,407,340,607}; DDBLTFX fx={0,}; @@ -1192,15 +1192,15 @@ bool CRadar_Device::BeginScene() pDDSTarget->Blt(&rc,NULL,NULL,DDBLT_COLORFILL ,&fx); } }else{ - //°ÔÀÓÀÌ ½ÃÀÛµÇÁö ¾Ê¾ÒÀ¸¸é.. blank¸¦ º¸¿©ÁØ´Ù. + //If game has not started.. show blank. pD3DDevice->Clear(0,NULL,D3DCLEAR_TARGET ,0,1.0f,0); } pD3DDevice->BeginScene(); if(sh_game_started && IsMechShutdown()){ - //shut down buttonÀ» ±×¸°´Ù. + //Draw shutdown button. int state[12]={0,2,0,}; - state[3]=recent_state[3];//flush state´Â.. ÃÖ±Ù °ªÀ» °¡Á®´Ù ¾´´Ù. - state[11]=recent_state[11];//flush state´Â.. ÃÖ±Ù °ªÀ» °¡Á®´Ù ¾´´Ù. + state[3]=recent_state[3];//flush state: use the most recent value. + state[11]=recent_state[11];//flush state: use the most recent value. if (!g_aaRadarText[0][0]) strcpy(&g_aaRadarText[0][0], g_szRadarJumpjet); strcpy(&g_aaRadarText[1][0], g_szRadarStartup); @@ -1294,7 +1294,7 @@ POINTF radar_text_pos[12]={ //state 1:ready //state 2:activated -//pilot mode¿¡¼­´Â ´Ù¸¥ Àǹ̸¦ °®´Â´Ù. +//Has a different meaning in pilot mode. bool CRadar_Device::DrawBackText(int state[12]) { @@ -1394,12 +1394,12 @@ bool CMFD_Device::InitSecond() { CHSH_Device::InitSecond(1024,512); // 640 x 480 if(g_f3dtarget){ - pDDSMechTexture=CreatePixelFormatTexture(pDD,128,128,&DDPF_R5G6B5);//3D¸ÞÅ© À̹ÌÁö ÀúÀåÇϱâ À§ÇÑ ÅؽºÃÄ... + pDDSMechTexture=CreatePixelFormatTexture(pDD,128,128,&DDPF_R5G6B5);//Texture for storing 3D mech image... }else{ // MSL 5.02 Target MFD Image - // pDDSMechTexture=CreatePixelFormatTexture(pDD,512,512,&DDPF_R5G6B5);//2D¸ÞÅ© À̹ÌÁö ÀúÀåÇϱâ À§ÇÑ ÅؽºÃÄ... - pDDSMechTexture=CreatePixelFormatTexture(pDD,1024,1024,&DDPF_R5G6B5);//2D¸ÞÅ© À̹ÌÁö ÀúÀåÇϱâ À§ÇÑ ÅؽºÃÄ... - //¸ðµç ¸ÞÅ©ÀÇ À̹ÌÁö¸¦ ÀúÀåÇÑ´Ù. + // pDDSMechTexture=CreatePixelFormatTexture(pDD,512,512,&DDPF_R5G6B5);//texture for storing 2D mech image... + pDDSMechTexture=CreatePixelFormatTexture(pDD,1024,1024,&DDPF_R5G6B5);//Texture for storing 2D mech image... + //Store images for all mechs. for(int mech=0;mechClear(0,NULL,D3DCLEAR_TARGET ,0,0,0); pD3DDevice->BeginScene(); @@ -1562,7 +1562,7 @@ bool CMFD_Device::EndChannel() //color = 0xFFFFFFFF; D3DTLVERTEX Vertices[4]; // Vertices for the cube - float w=(float)size_back.cx/2;//<==ÁÖÀÇ: ÀÌÁ¡ÀÌ radar¿Í ´Ù¸¥Á¡ÀÌ´Ù. + float w=(float)size_back.cx/2;//<==NOTE: this differs from radar. float x1=(ch/3)*w; float x2=x1+w; float h=(float)size_back.cy; @@ -1633,7 +1633,7 @@ bool CMFD_Device::BeginScene() } pD3DDevice->BeginScene(); if(sh_game_started) { - //°ÔÀÓÀÌ ½ÃÀ۵ǾúÀ»¶§¸¸.. ¹è°æÀ» ±×¸°´Ù. + //Draw background only when game has started.. DrawMFDBackGrid(); } pD3DDevice->EndScene(); @@ -1775,7 +1775,7 @@ bool CMFD_Device::DrawMFDBackTextAux3(int state) POINTF &tc = mfd_text_coord[i]; if(i!=4){ pFont[2].DrawTextMultiLine(tc.x,tc.y,0XFFFFFFFF,mfd_text_weapon[i],TEXTALIGN_ORG); - }else{//chain fire Ç¥½Ã + }else{//display chain fire DrawQuad((int)tc.x-80,(int)tc.y-20,(int)tc.x+80,(int)tc.y+20,0xFFFFFFFF); pFont[2].DrawTextMultiLine(tc.x,tc.y,0XFF000000,mfd_text_weapon[i],TEXTALIGN_ORG); } @@ -1889,20 +1889,20 @@ enum {TEAMORDER_NONE, TEAM_MODE, FREEFORALL_MODE, TEAM_MESSAGE1, TEAM_MESSAGE2}; bool CMFD_Device::DrawMFDDefaultBackAux1(int state) { if(state==TEAM_MODE){ - //¸ÞÅ©µéÀÇ »óŸ¦ º¸¿©ÁØ´Ù. + //Show mech status. DrawQuad(0,240-1,640,240+1,0xFFFFFFFF); DrawQuad(160-1,0,160+1,240,0xFFFFFFFF); DrawQuad(320-1,0,320+1,240,0xFFFFFFFF); DrawQuad(480-1,0,480+1,240,0xFFFFFFFF); }else if(state==FREEFORALL_MODE){ DrawQuadList(8,aux1freequads,0xFFFFFFFF); - }else if(state==TEAM_MESSAGE1){//À̰ɷμ­ ´õÀÌ»ó ±×¸±°ÍÀÌ ¾ø´Ù. + }else if(state==TEAM_MESSAGE1){//nothing more to draw. DrawMFDBackText(mfd_text_comm2); for(int i=0;i<7;i++){ int y=80+i*40; pFont[0].DrawText(80,(float)y,0xFFFFFFFF,&aux1_messages[i][0],0); } - }else if(state==TEAM_MESSAGE2){//À̰ɷμ­ ´õÀÌ»ó ±×¸±°ÍÀÌ ¾ø´Ù. + }else if(state==TEAM_MESSAGE2){//nothing more to draw. DrawMFDBackText(mfd_text_comm2); for(int i=0;i<7;i++){ int y=80+i*40; @@ -2025,9 +2025,9 @@ void CHSHFont::Init(LPDIRECTDRAW7 pDD, LPDIRECT3DDEVICE7 pd3dDevice ,const char* DWORD x = 0; DWORD y = 0; - char str[4] = {0,};//DWORD align½ÃÅ°±â À§Çؼ­..(¿ø·¡´Â 2¸¦ ¾²¸éµÈ´Ù.) + char str[4] = {0,};//For DWORD alignment.. (originally 2 would suffice.) SIZE size; - m_dwMaxWidth=0;//ÃÖ¼Ò°ªÀ¸·Î ÃʱâÈ­ÇÑ´Ù. + m_dwMaxWidth=0;//Initialize to minimum value. for( char c=32; c<127; c++ ){ str[0] = c; @@ -2037,11 +2037,11 @@ void CHSHFont::Init(LPDIRECTDRAW7 pDD, LPDIRECT3DDEVICE7 pd3dDevice ,const char* x = 0; y += size.cy+1; } - if(size.cx>(int)m_dwMaxWidth){//¹®ÀÚ ÇϳªÁß °¡Àå Å«°Í.. + if(size.cx>(int)m_dwMaxWidth){//widest single character.. m_dwMaxWidth=size.cx; } - //j°¡ iÀÇ ¿µ¿ªÀ» ħ¹üÇÑ´Ù. ÀûÀýÇÑ Á¶Ä¡¸¦ ÃëÇÒ°Í... + //j invades the region of i. Take appropriate action... ExtTextOut( hDC, x+0, y+0, ETO_OPAQUE, NULL, str, 1, NULL ); m_fTexCoords[c-32][0] = ((float)(x+0))/m_dwTexWidth; @@ -2073,7 +2073,7 @@ void CHSHFont::Init(LPDIRECTDRAW7 pDD, LPDIRECT3DDEVICE7 pd3dDevice ,const char* DeleteDC( hDC ); DeleteObject( hFont ); - //////StateBlock°ü·Ã.. + //////StateBlock related.. for( UINT which=0; which<2; which++ ){ m_pd3dDevice->BeginStateBlock(); m_pd3dDevice->SetTexture( 0, m_pTexture ); @@ -2114,9 +2114,9 @@ void CHSHFont::Init(LPDIRECTDRAW7 pDD, LPDIRECT3DDEVICE7 pd3dDevice ,const char* DWORD x = 0; DWORD y = 0; - char str[4] = {0,};//DWORD align½ÃÅ°±â À§Çؼ­..(¿ø·¡´Â 2¸¦ ¾²¸éµÈ´Ù.) + char str[4] = {0,};//For DWORD alignment.. (originally 2 would suffice.) SIZE size; - m_dwMaxWidth=0;//ÃÖ¼Ò°ªÀ¸·Î ÃʱâÈ­ÇÑ´Ù. + m_dwMaxWidth=0;//Initialize to minimum value. for( char c=32; c<127; c++ ){ str[0] = c; @@ -2126,11 +2126,11 @@ void CHSHFont::Init(LPDIRECTDRAW7 pDD, LPDIRECT3DDEVICE7 pd3dDevice ,const char* x = 0; y += size.cy+1; } - if(size.cx>(int)m_dwMaxWidth){//¹®ÀÚ ÇϳªÁß °¡Àå Å«°Í.. + if(size.cx>(int)m_dwMaxWidth){//widest single character.. m_dwMaxWidth=size.cx; } - //j°¡ iÀÇ ¿µ¿ªÀ» ħ¹üÇÑ´Ù. ÀûÀýÇÑ Á¶Ä¡¸¦ ÃëÇÒ°Í... + //j invades the region of i. Take appropriate action... ExtTextOut( hDC, x+0, y+0, ETO_OPAQUE, NULL, str, 1, NULL ); m_fTexCoords[c-32][0] = ((float)(x+0))/m_dwTexWidth; @@ -2161,7 +2161,7 @@ void CHSHFont::Init(LPDIRECTDRAW7 pDD, LPDIRECT3DDEVICE7 pd3dDevice ,const char* DeleteDC( hDC ); DeleteObject( hFont ); - //////StateBlock°ü·Ã.. + //////StateBlock related.. for( UINT which=0; which<2; which++ ){ m_pd3dDevice->BeginStateBlock(); m_pd3dDevice->SetTexture( 0, m_pTexture ); @@ -2191,7 +2191,7 @@ void CHSHFont::Cleanup() } SAFE_RELEASE( m_pTexture ); SAFE_RELEASE( m_pd3dDevice ); - }//m_pd3dDevice==NULLÀÌ¸é ¾Æ¹«°Íµµ ÇÏÁö ¾Ê´Â´Ù. + }//If m_pd3dDevice==NULL, do nothing. } HRESULT CHSHFont::GetTextExtent(const char* strText, SIZE* pSize ) @@ -2240,12 +2240,12 @@ HRESULT CHSHFont::DrawText( float sx, float sy, DWORD dwColor,const char* strTex DWORD dwNumVtx = 0; D3DTLVERTEX * pVertices =m_pVB; char c; - float osx=sx;//¿ø·¡ÀÇ sx; - float h = (m_fTexCoords[0][3]-m_fTexCoords[0][1]) * m_dwTexHeight ;//ÇѱÛÀÚÀÇ ³ôÀÌ´Â ¸ðµÎ µ¿ÀÏÇÒ °ÍÀÌ´Ù. + float osx=sx;//original sx; + float h = (m_fTexCoords[0][3]-m_fTexCoords[0][1]) * m_dwTexHeight ;//Height of each character should all be the same. while( (c = *strText++)!=0 ){ - if( c == '\n')sy+=h,sx=osx;//¿©·¯ÁÙÀ» Ç¥½ÃÇÒ¶§... + if( c == '\n')sy+=h,sx=osx;//when displaying multiple lines... if( c < ' ' )continue; @@ -2274,7 +2274,7 @@ HRESULT CHSHFont::DrawText( float sx, float sy, DWORD dwColor,const char* strTex sx += w; } - //³ª¸ÓÁö °ÍµéÀ» ±×¸°´Ù. + //Draw the remaining items. if(dwNumVtx> 0 ){ m_pd3dDevice->DrawPrimitive( D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX ,m_pVB,dwNumVtx,0 ); } @@ -2342,7 +2342,7 @@ HRESULT CHSHFont::DrawTextMultiLine( float sx, float sy, DWORD dwColor,const cha break; } - char string[128];//ÃÖ´ë°ªÀ» ÀÓÀÇ·Î Á¤ÇÑ´Ù. + char string[128];//Max length set arbitrarily. strcpy(string,strText); char * seps="\n"; char * token; @@ -2377,7 +2377,7 @@ HRESULT CHSHFont::DrawTextVerticalOrg( float sx, float sy, DWORD dwColor,const c float h = (float)((m_fTexCoords[0][3]-m_fTexCoords[0][1])*m_dwTexHeight); float w = (float)m_dwMaxWidth; - //°¡·Î ¾²±â¶ó°í °¡Á¤ÇßÀ»¶§ÀÇ ¸íĪÀÌ´Ù. + //Name assuming horizontal (left-to-right) text layout. int col_count=0;//maximum column count int row_count=1; @@ -2395,7 +2395,7 @@ HRESULT CHSHFont::DrawTextVerticalOrg( float sx, float sy, DWORD dwColor,const c ccount++; if(ccount>col_count)col_count=ccount;//update the max value } - //¿©±â¼­´Â »õ·Î ¾²±âÀ϶§ÀÇ Å©±âÀÌ´Ù. + //This is the size when writing from scratch. SIZE size; size.cx=(int)(row_count*w); size.cy=(int)(col_count*h); @@ -2408,7 +2408,7 @@ HRESULT CHSHFont::DrawTextVerticalOrg( float sx, float sy, DWORD dwColor,const c m_pd3dDevice->ApplyStateBlock( m_dwDrawTextStateBlock ); m_pd3dDevice->SetTexture(0,m_pTexture); - char string[128];//ÃÖ´ë°ªÀ» ÀÓÀÇ·Î Á¤ÇÑ´Ù. + char string[128];//Max length set arbitrarily. strcpy(string,strText); char * seps="\n"; char * token; @@ -2416,7 +2416,7 @@ HRESULT CHSHFont::DrawTextVerticalOrg( float sx, float sy, DWORD dwColor,const c DWORD dwNumVtx = 0; D3DTLVERTEX * pVertices =m_pVB; - float osy=sy-size.cy/2;//¿ø·¡ÀÇ sy °¡Àå ³ôÀº ÁÂÇ¥..; + float osy=sy-size.cy/2;//original sy: topmost coordinate..; sx=sx-size.cx/2; @@ -2456,7 +2456,7 @@ HRESULT CHSHFont::DrawTextVerticalOrg( float sx, float sy, DWORD dwColor,const c token = strtok( NULL, seps ); } - //³ª¸ÓÁö °ÍµéÀ» ±×¸°´Ù. + //Draw the remaining items. if(dwNumVtx> 0 ){ m_pd3dDevice->DrawPrimitive( D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX ,m_pVB,dwNumVtx,0 ); } @@ -2506,20 +2506,20 @@ int __cdecl CopyTargetImage(int stage,LPDIRECTDRAWSURFACE7 tex,int step) if(stage==1){ if(inited){ //normal function - //¼º´É»óÀÇ ÀÌÀ¯·Î.. ¸ÇóÀ½¿¡ µÎ¾úÀ½.. + //Placed at the top for performance reasons.. RECT rc={0,0,128,128}; LONG lPitch; LPDWORD agp_org,agp,pci_org,pci,mem; int x,y; int sx=0,sy=10,ex=120,ey=112; - //int hy=ey-sy;//³ôÀÌ. + //int hy=ey-sy;//height. // if(1<=sh_step&&sh_step<=3){ //1. AGP->MEM - //int h=(sh_step-1)*hy/3;//¼¼±×¸ÕÆ® ¿ÀÇÁ¼Â.. + //int h=(sh_step-1)*hy/3;//segment offset.. mem=mem_org; agp_org=(DWORD*)GetSurfacePointer(SH_TargetBufferSurface,rc,lPitch,DDLOCK_READONLY ); if(agp_org!=NULL){ - if(lPitch%4==0){// DWORD alignµÆÀ»¶§¸¸ ½ÇÇàÇÑ´Ù. + if(lPitch%4==0){// execute only when DWORD aligned. for(y=sy;ySetTextureStageState(0,D3DTSS_COLOROP ,D3DTOP_MODULATE); pd3dDevice->SetTextureStageState(0,D3DTSS_COLORARG1 ,D3DTA_TEXTURE); diff --git a/Gameleap/code/CoreTech/Libraries/GameOS/render.hpp b/Gameleap/code/CoreTech/Libraries/GameOS/render.hpp index 618cb664..f2d55c84 100644 --- a/Gameleap/code/CoreTech/Libraries/GameOS/render.hpp +++ b/Gameleap/code/CoreTech/Libraries/GameOS/render.hpp @@ -1,4 +1,4 @@ -//D3DCOLOR_XXXXÁ¤À§ÇÑ´Ù.(d3d8types.h¿¡ Á¤ÀǵǾî ÀÖÀ¸¹Ç·Î. Á¤ÀǵǾîÀÖÁö ¾ÊÀ»°ÍÀÌ´Ù. +//D3DCOLOR_XXXX macros are defined in d3d8types.h and will not be redefined here. #ifndef D3DCOLOR_ARGB #define D3DCOLOR_ARGB(a,r,g,b) (D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) @@ -44,10 +44,10 @@ enum AUX1STATE #define AUX1_TEAM_MESSAGE 2 #define AUX1_FREE_MESSAGE 3 -//°¢ µð¹ÙÀ̽º¸¶´Ù.., °¢ ÆùÆ® Á¾·ù(typeface,Å©±â,±¼±â,±â¿ï±â)°¡ ´Þ¶óÁú¶§ ¸¶´Ù Çϳª¾¿ »ý¼º½ÃÄÑ »ç¿ëÇÏ¸é µÈ´Ù. +//Create one instance per device per font type (typeface, size, bold, italic). class CHSHFont { - //ÀϽÃÀûÀ¸·Î »ç¿ëµÇ°í.. °¢ instance¸¶´Ù »ç¿ëµÇ¾îÁú ÇÊ¿ä°¡ ¾øÀ¸¹Ç·Î staticÀ¸·Î ÇÏ¿´´Ù. + //Used temporarily; no need per instance, so declared static. static D3DTLVERTEX m_pVB[300]; LPDIRECT3DDEVICE7 m_pd3dDevice; @@ -59,7 +59,7 @@ class CHSHFont DWORD m_dwSavedStateBlock; DWORD m_dwDrawTextStateBlock; - DWORD m_dwMaxWidth;//¹®ÀÚ ÇϳªÁß °¡Àå Å«°Í.. + DWORD m_dwMaxWidth;//Width of the widest single character.. public: CHSHFont(); ~CHSHFont(); @@ -80,10 +80,10 @@ public: CHSH_Device* m_pOtherHSHD; public: LPDIRECTDRAW7 pDD; - LPDIRECTDRAWSURFACE7 pDDSFront; //FlipÀ» ÇϱâÀ§Çؼ­ ÇÊ¿ä.. - LPDIRECTDRAWSURFACE7 pDDSBack; //DrawingÇϱâ À§Çؼ­ ÇÊ¿ä. - LPDIRECTDRAWSURFACE7 pDDSTarget; //½ÇÁ¦ ±×¸®´Â ÅؽºÃÄ ÀÌ´Ù. - LPDIRECTDRAWSURFACE7 pDDSTexture; //½ÇÁ¦ ±×¸®´Â ÅؽºÃÄ ÀÌ´Ù. + LPDIRECTDRAWSURFACE7 pDDSFront; //Required for Flip.. + LPDIRECTDRAWSURFACE7 pDDSBack; //Required for Drawing. + LPDIRECTDRAWSURFACE7 pDDSTarget; //The actual rendering texture. + LPDIRECTDRAWSURFACE7 pDDSTexture; //The actual rendering texture. LPDIRECT3DDEVICE7 pD3DDevice; CHSHFont pFont[4]; SIZE size_back; @@ -141,7 +141,7 @@ public: bool InitFirst(); bool InitSecond(); LPDIRECTDRAWSURFACE7 pDDSBackground; //one attatched image sruface - LPDIRECTDRAWSURFACE7 pDDSRadarDamageTexture;//¸ÞÅ© µ¥¹ÌÁö ÅؽºÃÄ.. + LPDIRECTDRAWSURFACE7 pDDSRadarDamageTexture;//Mech damage texture.. // MSL 5.03 Mechview LPDIRECTDRAWSURFACE7 pDDSMechViewBkgnd; LPDIRECTDRAWSURFACE7 pDDSMechViewBeagle; @@ -151,7 +151,7 @@ public: LPDIRECTDRAWSURFACE7 pDDSMechViewLightamp; LPDIRECTDRAWSURFACE7 m_pDDSMechView; //m x n - tiled 3D MechView images - virtual bool BeginScene(); //texture¸¦ ratate½ÃÄѼ­ Ãâ·ÂÇϱâ À§ÇÑ ·çƾÀÌ Æ÷ÇԵȴÙ.. backgroundÀ̹ÌÁö¸¦.. ¹Ì¸® Ãâ·ÂÇÑ´Ù... + virtual bool BeginScene(); //Rotates and outputs texture; pre-renders background image... virtual bool EndScene(); virtual bool Release(); bool LoadRadarDamageTexture(const char *mechtexturename); @@ -163,10 +163,10 @@ class CMFD_Device:public CHSH_Device { public: //CHSHFont SmallFont; - LPDIRECTDRAWSURFACE7 pDDSMechTexture;//3D¸ÞÅ© À̹ÌÁö ÀúÀåÇϱâ À§ÇÑ ÅؽºÃÄ... - LPDIRECTDRAWSURFACE7 pDDSDamageTexture;//¸ÞÅ© µ¥¹ÌÁö ÅؽºÃÄ.. + LPDIRECTDRAWSURFACE7 pDDSMechTexture;//Texture for storing 3D mech image... + LPDIRECTDRAWSURFACE7 pDDSDamageTexture;//Mech damage texture.. // MSL 5.03 Target Damage Display - LPDIRECTDRAWSURFACE7 pDDSTargetTexture;//¸ÞÅ© µ¥¹ÌÁö ÅؽºÃÄ.. + LPDIRECTDRAWSURFACE7 pDDSTargetTexture;//Target damage texture.. DWORD ch; //current channel.... CHSH_Device* m_pRightDevice; // mode 4: pointer to right 640x480 device (NULL in modes 1-3) @@ -175,11 +175,11 @@ public: ~CMFD_Device(); bool InitFirst(); bool InitSecond(); - bool BeginChannel(DWORD channel);// 0~4¹øÀÇ Ã¤³ÎÀ» Á¤ÇÒ ¼ö ÀְԵȴÙ. + bool BeginChannel(DWORD channel);// Select channel 0-4. bool EndChannel(); - virtual bool BeginScene(); //normalÇÑ beginscene/endscene¸¦ ÇÑ´Ù. + virtual bool BeginScene(); //Performs normal BeginScene/EndScene. bool BeginSceneRight(); // mode 4: clear+grid on right device at sh_step==1 - virtual bool EndScene(); //flipÀ» ÇÑ´Ù. + virtual bool EndScene(); //Performs the Flip. virtual bool Release(); bool LoadDamageTexture(const char *mechtexturename); // MSL 5.03 Target Damage Display @@ -214,10 +214,10 @@ public: bool InitFirst(); bool InitSecond(); LPDIRECTDRAWSURFACE7 pDDSBackground; //one attatched image sruface - LPDIRECTDRAWSURFACE7 pDDSMapTexture; //½ºÅ©·ÑµÇ´Â ¸Ê À̹ÌÁö¸¦ À§ÇÑ ÅؽºÃÄ.. - LPDIRECTDRAWSURFACE7 pDDSMRTargetTexture;//¸ÞÅ© µ¥¹ÌÁö ÅؽºÃÄ.. + LPDIRECTDRAWSURFACE7 pDDSMapTexture; //Texture for scrollable map image.. + LPDIRECTDRAWSURFACE7 pDDSMRTargetTexture;//Mission Review target texture.. bool LoadMRTargetTexture(const char *mechtexturename); - virtual bool BeginScene(); //texture¸¦ ratate½ÃÄѼ­ Ãâ·ÂÇϱâ À§ÇÑ ·çƾÀÌ Æ÷ÇԵȴÙ.. backgroundÀ̹ÌÁö¸¦.. ¹Ì¸® Ãâ·ÂÇÑ´Ù... + virtual bool BeginScene(); //Rotates and outputs texture; pre-renders background image... virtual bool EndScene(); virtual bool Release(); }; diff --git a/Gameleap/code/CoreTech/Libraries/gosHelp/Remote.cpp b/Gameleap/code/CoreTech/Libraries/gosHelp/Remote.cpp index 0b552bdd..3810812c 100644 --- a/Gameleap/code/CoreTech/Libraries/gosHelp/Remote.cpp +++ b/Gameleap/code/CoreTech/Libraries/gosHelp/Remote.cpp @@ -71,7 +71,7 @@ INTERNET_STATUS_STATE_CHANGE INTERNET_STATE_DISCONNECTED_BY_USER Disconnected by user request. INTERNET_STATE_IDLE - No network requests are being made by the Win32® Internet functions. + No network requests are being made by the Win32® Internet functions. INTERNET_STATE_BUSY Network requests are being made by the Win32 Internet functions. INTERNET_STATUS_USER_INPUT_REQUIRED diff --git a/Gameleap/code/Launcher/Cstr.cpp b/Gameleap/code/Launcher/Cstr.cpp index 78a8b128..cabf94a1 100644 --- a/Gameleap/code/Launcher/Cstr.cpp +++ b/Gameleap/code/Launcher/Cstr.cpp @@ -1077,7 +1077,7 @@ int CStrArray::GetTotalLength() const int nTotalLength; int i, nSize = GetSize(); - nTotalLength = nSize; // nSize°³ÀÇ '\0' + nTotalLength = nSize; // nSize null terminators '\0' for(i = 0; i < nSize; i++) { nTotalLength += strlen(GetAt(i)); } diff --git a/Gameleap/code/Launcher/ctcl.cpp b/Gameleap/code/Launcher/ctcl.cpp index a1e70646..8c786d07 100644 --- a/Gameleap/code/Launcher/ctcl.cpp +++ b/Gameleap/code/Launcher/ctcl.cpp @@ -514,7 +514,7 @@ void CSOC_Server::OnSendFile() BYTE bCode; if (Disassemble("B", &bCode)) { ASSERT((bCode == 0) || (bCode == 3)); - // ¹Þ¾Æ°¡½Ã¿À from Game to console... + // Receiving from Game to console... SYSTEMTIME* pSysTime; WORD wSysTimeSize; GUID* pGUID; @@ -530,7 +530,7 @@ void CSOC_Server::OnSendFile() pSF = g_pCTCLManager->m_SFM_Recv.Find(*pGUID, nType); if (pSF) { if (bCode == 3) { - // ¹Ì¼Ç¸®ºä ¼­¹ö°¡ mission review ¹Þ¾Ò´Ù´Â °ÍÀ» ¹Þ¾Ò´À³Ä? + // Did we receive confirmation the mission review server got the mission review? pSF->m_bProcessed = true; g_pCTCLManager->m_SFM_Recv.Cut(pSF); g_pCTCLManager->m_SFM_Done.AddTail(pSF); @@ -907,7 +907,7 @@ void CSOC_Client::OnSendFile() BYTE bCode; if (Disassemble("B", &bCode)) { ASSERT((bCode == 1) || (bCode == 2)); - // ¹Þ¾Ò¿À from console to Game... + // Received from console to Game... SYSTEMTIME* pSysTime; WORD wSysTimeSize; GUID* pGUID; @@ -1425,21 +1425,21 @@ void CCTCLManager::Run() #endif // !defined(CTCL_LAUNCHER) } else { /* - Ŭ¶óÀ̾ðÆ®³ª ¼­¹öÀÇ °æ¿ì ½ÇÇàµÇ´Â ÄÚµåÀÌ´Ù. + Code executed for both client and server. - *ÀÖÀ»¼ö ÀÖ´Â »óŵé - ¼­¹ö/Ŭ¶óÀ̾ðÆ®°¡ °áÁ¤µÇ±âÀü.. ¸í·É ´ë±â»óÅ - (Á¾·á/¼­¹ö½ÃÀÛ/Ŭ¶óÀ̾ðÆ® ½ÃÀÛµîÀÇ ¸í·ÉÀÌ ¿Ã¼ö ÀÖ´Ù.) + *Possible states: + Before server/client role is determined: waiting for commands + (Commands such as exit/start-server/start-client may arrive.) - ¼­¹ö·Î ½ÇÇàµÇ¾î ¼­¹ö ¸ÞÅ© ¼³Á¤¿¡ ´ëÇÑ µ¥ÀÌŸ¸¦ ±â´Ù¸®´Â »óÅ - (CreateSession°¡ ½ÇÇàµÈ »óÅÂÀÌ´Ù.) - ¼­¹ö·Î ½ÇÇàµÇ¾î Botµé¿¡ ´ëÇÑ Á¤º¸¸¦ ±â´Ù¸®´Â »óÅ - (Ŭ¶óÀ̾ðÆ®ÀÇ Âü¿©´Â Ŭ¶óÀ̾ðÆ®¿Í ¼­¹ö°£¿¡ ÀÚµ¿À¸·Î ÀÌ·ç¾îÁø´Ù.) - ¼­¹ö·Î ½ÇÇàµÇ¾î Launch¸¦ ±â´Ù¸®´Â »óÅ + Running as server, waiting for server mech configuration data + (State after CreateSession has been called.) + Running as server, waiting for Bot information + (Client joining happens automatically between client and server.) + Running as server, waiting for Launch - ==>Ŭ¶óÀ̾ðÆ®´Â ½ÇÇàÁï½Ã µ¥ÀÌŸµéÀÌ Àü´ÞµÇ¹Ç·Î ´ë±â»óÅ°¡ ¾ø´Ù. + ==>Client has no waiting state as data is transferred immediately on startup. - ==>°¢°¢ÀÇ »óŸ¦ Á¤ÀÇÇÏ°í °¢ »óÅ¿¡ ¸Â´Â 󸮸¦ ÇØÁÖ¸é µÈ´Ù. + ==>Define each state and implement the appropriate handling for each. switch(state){ } */ @@ -1521,8 +1521,8 @@ void CCTCLManager::DoMech4Comm() } break; case 1: - //¼­¹ö/Ŭ¶óÀ̾ðÆ®·Î¼­ ½ÇÇàÁغñÇϵµ·Ï ¸í·ÉÀ» Àü´ÞÇÑ´Ù. - //¶ÇÇÑ ¼­¹ö¸¦ ½ÇÇàÇϴµ¥ ÇÊ¿äÇÑ ¸ðµç ÆĶó¹ÌÅ͵µ ÇÔ²² Àü´ÞÇÑ´Ù. + //Send command to prepare for execution as server/client. + //Also transmit all parameters required to run the server. for(i = 0; i < g_nPlayerInfos; i++) { SPlayerInfo& pi = g_aPlayerInfos[i]; if (!pi.m_bBot) { @@ -1549,12 +1549,12 @@ void CCTCLManager::DoMech4Comm() } } if (i == g_nPlayerInfos) { - // Botµé¿¡ ´ëÇÑ Á¤º¸¸¦ ¸ðµÎ Çѵ¥ ¹­¾î¼­ º¸³½´Ù. + // Bundle and send all Bot information together. CPacket pak(&SVR.GetGameSOC()); pak.Assemble("B", C_BOTS); for(i = 0; i < g_nPlayerInfos; i++) { - if (i != g_nServer) { // ¿ø·¡ Bot¸¸ Áö±ÝÀº ¼­¹ö¸¦ Á¦¿ÜÇÑ ÀüºÎ... + if (i != g_nServer) { // Originally bots only; now everyone except the server... SPlayerInfo& pi = g_aPlayerInfos[i]; pak.Assemble("BnsDWwsnn", pi.m_bBot, pi.m_nLevelOrTesla, pi.m_szName, pi.m_nMechIndex, pi.m_fileID, pi.m_recordID, pi.m_szMech, pi.m_nTeamOrSkin, pi.m_nDecal); } @@ -1565,10 +1565,10 @@ void CCTCLManager::DoMech4Comm() } break; case 4: - // °ÔÀÓÀÌ ¼º°øÀûÀ¸·Î ¸¸µé¾îÁö¸é ¼­¹ö¿Í Ŭ¶óÀ̾ðÆ®µéÀÇ Mech¿¡ ´ëÇÑ Á¤º¸µéÀ» SetÇÑ´Ù... + // Once the game is successfully created, set Mech info for server and all clients... if (SOCGame.m_nGameReturn == _EGR_OkCreateSession) { for(i = 0; i < g_nPlayerInfos; i++) { - if (i != g_nServer) { // ¼­¹ö´Â ÀÌ¹Ì SetMech¿¡ ÁøÀÔÇÑ »óÅÂ... + if (i != g_nServer) { // Server has already entered SetMech... SPlayerInfo& pi = g_aPlayerInfos[i]; if (!pi.m_bBot) { CTeslaInfo& ti = m_aTIs.GetAt(pi.m_nLevelOrTesla); @@ -1581,8 +1581,8 @@ void CCTCLManager::DoMech4Comm() } break; case 6: - //¸ðµç Ŭ¶óÀ̾ðµåµéÀÌ ¼­¹ö¿¡ Âü¿©Çϱ⸦ ±â´Ù¸°´Ù.<==ÀÌ ÀÀ´äÀº ¼­¹ö·Î ºÎÅÍ ¾òÀ» ¼ö ÀÖ´Ù. - //Âü¿©°¡ ¸ðµÎ ³¡³µÀ¸¸é, ¼­¹ö·Î ÇÏ¿©±Ý °ÔÀÓÀ» Launch½ÃÅ°µµ·Ï ÇÑ´Ù. + //Wait for all clients to join the server. <==This response comes from the server. + //Once all clients have joined, instruct the server to Launch the game. if (SOCGame.m_nGameReturn == _EGR_OkLaunchReady) { g_nMech4Comm = 9; } diff --git a/Gameleap/code/Launcher/ctcl.h b/Gameleap/code/Launcher/ctcl.h index e9954aef..ffbc086b 100644 --- a/Gameleap/code/Launcher/ctcl.h +++ b/Gameleap/code/Launcher/ctcl.h @@ -42,7 +42,7 @@ public: const char* m_pcsz; int m_nLauncherConnection; // 0: no connection, +1: connection, -1: connecting - int m_nConnection2; // m_bCameraShip°ª¿¡ µû¶ó °ÔÀÓ È¤Àº Ä«¸Þ¶ó ½±°úÀÇ Á¢¼ÓÀ» ÀǹÌ, 0: no connection, +1: connection, -1: connecting + int m_nConnection2; // Connection to game or camera ship per m_bCameraShip, 0: no connection, +1: connected, -1: connecting int m_nApplType; int m_nApplState; int m_nGameState; diff --git a/Gameleap/code/Launcher/ctime.cpp b/Gameleap/code/Launcher/ctime.cpp index 89317a07..60c547c4 100644 --- a/Gameleap/code/Launcher/ctime.cpp +++ b/Gameleap/code/Launcher/ctime.cpp @@ -44,7 +44,7 @@ int GetDayEnd(int nYear, int nMonth) long GetTotalSeconds(int nYear, int nMonth, int nDay) { - // nYear, nMonth, nDay³¯ÀÇ 0½Ã 0ºÐ 0Ãʸ¦ 0À¸·Î ÇÑ ÃÊ´ÜÀ§ ¼ö... + // Seconds elapsed since 00:00:00 on the date nYear/nMonth/nDay... ASSERT(nYear >= 1970); ASSERT((1 <= nMonth) && (nMonth <= 12)); ASSERT(1 <= nDay); @@ -57,13 +57,13 @@ long GetTotalSeconds(int nYear, int nMonth, int nDay) if (IsLeapYear(nStart)) { nDays++; } - lTotal += nDays * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += nDays * 24 * 60 * 60; // 24 hours * 60 min * 60 sec } for(nStart = 1; nStart < nMonth; nStart++) { int nDayEnd = GetDayEnd(nYear, nStart); - lTotal += nDayEnd * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += nDayEnd * 24 * 60 * 60; // 24 hours * 60 min * 60 sec } - lTotal += (nDay - 1) * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += (nDay - 1) * 24 * 60 * 60; // 24 hours * 60 min * 60 sec return lTotal; } diff --git a/Gameleap/code/Launcher/ctime.h b/Gameleap/code/Launcher/ctime.h index 835eb000..eb787ad3 100644 --- a/Gameleap/code/Launcher/ctime.h +++ b/Gameleap/code/Launcher/ctime.h @@ -16,7 +16,7 @@ class CTimeDate public: union { struct { - // Bit Field´Â ¾ÕÂÊ¿¡ ÁöÁ¤µÈ °ÍÀÌ LowBitÀÌ´Ù. + // Bit Fields declared first are at the low-bit end. DWORD m_xDay: 5; // 2^0, 2^5-1 DWORD m_xMonth: 4; // 2^5, 2^4-1 DWORD m_xYear: TIMEDATE_YEAR_BITS; // from 1900-2155 // 2^9, 2^8-1 diff --git a/Gameleap/code/Launcher/mugSocs.cpp b/Gameleap/code/Launcher/mugSocs.cpp index 4488c3cf..55e830ca 100644 --- a/Gameleap/code/Launcher/mugSocs.cpp +++ b/Gameleap/code/Launcher/mugSocs.cpp @@ -1375,7 +1375,7 @@ void CSockAddr::SetTarget(const char* pcszAddr) { if (pcszAddr) { sin_addr.s_addr = inet_addr(pcszAddr); - if (sin_addr.s_addr == INADDR_ANY) { // 0.0.0.0À̱⠶§¹®¿¡ HOST/Network Addr¹«°ü + if (sin_addr.s_addr == INADDR_ANY) { // 0.0.0.0, HOST/Network Addr irrelevant hostent* pHN = gethostbyname(pcszAddr); if (pHN) { sin_addr.s_addr = *(u_long*)pHN->h_addr; @@ -3667,7 +3667,7 @@ CSOCListen* CSOCManager::DoListen(int nPort, PFN_CreateSOCClient pfnCSC, DWORD d pSOCListen = new CSOCListen(nPort); pSOCListen->SetCSCParam(pfnCSC, dwCSCParam1, dwCSCParam2); if (!DoListen(pSOCListen, nPort)) { - // °°Àº Æ÷Æ®¸¦ 2¹ø Listen ÇÏ´Â °æ¿ì?... + // Case of Listen on the same port twice?... pSOCListen = NULL; } diff --git a/Gameleap/code/Launcher/mugsocs.h b/Gameleap/code/Launcher/mugsocs.h index e0495c0a..4df009db 100644 --- a/Gameleap/code/Launcher/mugsocs.h +++ b/Gameleap/code/Launcher/mugsocs.h @@ -41,7 +41,7 @@ extern char SERVERID[]; #endif // !MAX_PACKET #ifndef MAX_FTPBUF #define MAX_FTPBUF 1024 -// MAX_FTPBUF´Â MAX_PACKETº¸´Ù ¹Ýµå½Ã ÀÛ¾Æ¾ß ÇÑ´Ù? +// MAX_FTPBUF must be smaller than MAX_PACKET? // 9+size==sizeof(bCmd) + sizeof(FTID) + sizeof(size) + size #endif // !MAX_FTPBUF @@ -251,7 +251,7 @@ private: #define ESTRF_USER_START 100 -#define ESTRF_PASSWORDCHANGED 110 // ·Î±×ÀÎÇÏ°í ÀÖ´Â µ¿¾È¿¡ Æнº¿öµå°¡ ¹Ù²ñ +#define ESTRF_PASSWORDCHANGED 110 // Password changed while logged in void Randomize(); @@ -268,7 +268,7 @@ union UPacketValue class CDAPacket : public SOCBase_Class { -// PacketÀÇ ¾Õ ºÎºÐÀ» ó¸®ÇÏ°í ³­ µÞ ºÎºÐÀÇ °¡º¯ ÆĶó¹ÌÅÍ... +// Variable parameters in the tail portion after processing the packet header... public: BYTE m_bCmd; BYTE m_bReserved; @@ -361,8 +361,8 @@ public: #define C_ROOM_MAKE 232 // s - name, s - password #define C_ROOM_JOIN 233 -// d - number(RoomÀ» ¶°³ª´Â °ÍÀº -1), s - password -#define S_ROOM_JOIN 233 // C_ROOM_MAKE/C_ROOM_JOINÀÇ °á°ú... +// d - number (leaving a Room = -1), s - password +#define S_ROOM_JOIN 233 // Result of C_ROOM_MAKE/C_ROOM_JOIN... // b - code(CSCODE_OK or error code), d - number #define C_ROOM_UPDS 234 // CSCODE_... + @ @@ -384,13 +384,13 @@ public: #define S_FTP 254 //... see ftp.txt #define X_KEEPALIVE 255 // no parameters, should be ignored... -#define TX_SYSTEM 0 // ½Ã½ºÅÛ ¸Þ½ÃÁö... -#define TX_NORMAL 1 // ÀÏ¹Ý Ã¤Æà ÅؽºÆ® -#define TX_WARNING 2 // °æ°í -#define TX_ERROR 3 // ¿À·ù -#define TX_FATAL 4 // Ä¡¸íÀûÀÎ ¿À·ù -#define TX_INFO 5 // »ç¿ëÀÚ Á¤º¸ µîÀÇ Information Result... -#define TX_SAY 6 // ±Ó¼Ó¸» +#define TX_SYSTEM 0 // System message... +#define TX_NORMAL 1 // Regular chat text +#define TX_WARNING 2 // Warning +#define TX_ERROR 3 // Error +#define TX_FATAL 4 // Fatal error +#define TX_INFO 5 // Information result (e.g. user info)... +#define TX_SAY 6 // Whisper #define TX_LOCAL 7 // local echo.... #define TX_UNKNOWN 0xffff // unknown... @@ -493,7 +493,7 @@ CPacket protected: CSOC* m_pSOC; private: - // ÀÌ ¾ÈÀÇ ºí·°Àº ¹Ýµå½Ã ¿¬¼ÓÇØ¾ß ÇÑ´Ù... + // The block within must be contiguous... WORD m_wLen; BYTE m_ba[MAX_PACKET]; // @@ -587,7 +587,7 @@ end of variable PACKET_MAP definitions... class CFileTransfer : public TDBLNK(CFileTransfer*) { public: - // ¼­¹ö·Î ºÎÅÍ ¹ÞÀº Á¤º¸... - ȤÀº Ŭ¶óÀ̾ðÆ®¿¡°Ô ÀüÇØÁÙ Á¤º¸... + // Information received from server... - or information to relay to client... BOOL m_bClientSite; DWORD m_dwFTID; DWORD m_dwGUARD; @@ -680,18 +680,18 @@ protected: // time out to Drop... DWORD m_dwKARcvTimeOut; #ifdef WIN32 - // º¸Åë Login°úÁ¤¿¡ ¾²ÀÌ´Â À©µµ¿ì ÇÚµé + // Window handle typically used during Login process HWND m_hWndOwner; #endif // WIN32 - // º¸Åë ±Û·Î¹ú º¯¼ö·Î ¾²ÀÌ´Â ¼ÒÄÏÆ÷ÀÎÅÍ¿¡ ´ëÇÑ ÀÚµ¿ NULL AssignÀ» À§ÇÏ¿© + // For auto NULL assignment of socket pointer typically used as a global variable PSOC* m_ppSOC; - // ¼ÒÄÏÀ» ±¸ºÐÇϱâ À§ÇÏ¿© »ç¿ëÀÚ ÇÁ·Î±×·¥¿¡¼­ ¾²ÀÌ´Â ¾ÆÀ̵ð - // ÁÖ·Î ¼­¹öÀÇ °æ¿ì¿¡´Â Ŭ¶óÀ̾ðÆ®°¡ Á¢¼ÓÇÒ ¶§¸¶´Ù °íÀ¯ ¾ÆÀ̵𸦠ºÎ¿©ÇÏ¿© »ç¿ë - // ÇϳªÀÇ Client°¡ ´Ù¼öÀÇ ¼­¹ö¿¡ Á¢¼ÓÇÒ ¶§(ÁÖ·Î StarÇü) °¢°¢ÀÇ Á¢¼ÓÀ» ±¸ºÐÇÒ ¶§ »ç¿ë - // Ŭ¶óÀ̾ðÆ®°¡ ÇϳªÀÇ ¼­¹ö¿¡¸¸ Á¢¼ÓÇÏ´Â °æ¿ì Ŭ¶óÀ̾ðÆ®°¡ ¼­¹ö¿¡ Á¢¼Ó ÁßÀÎÁö ȤÀº Á¢¼ÓÇß´ÂÁö¸¦ ÆÇ´ÜÇÒ ¶§ - // CSOCManager::FindSOC(CSOC_SERVER_ID==default)->GetConnectionState()¸¦ »ç¿ë. - // limits.h¸¦ includeÇؾßÇÔ. - // CSOC»ý¼º½ÃÀÇ ±âº»°ª: CSOCServer == CSOC_SERVER_ID(=INT_MIN), CSOCClient == CSOC_CLIENT_ID(=0), CSOCListen == CSOC_LISTEN_ID(=-1) + // ID used in user program to identify a socket + // Mainly for servers: assigns a unique ID each time a client connects + // Used to distinguish each connection when a client connects to multiple servers (Star topology) + // When a client connects to only one server: used to check if client is connecting or already connected + // Use CSOCManager::FindSOC(CSOC_SERVER_ID==default)->GetConnectionState(). + // Must include limits.h. + // Default values at CSOC creation: CSOCServer==CSOC_SERVER_ID(INT_MIN), CSOCClient==CSOC_CLIENT_ID(0), CSOCListen==CSOC_LISTEN_ID(-1) union { int m_nID; UINT m_uID; @@ -725,8 +725,8 @@ protected: DWORD m_xGracefulRemote: 1; DWORD m_xAbortyLocal: 1; DWORD m_xAbortyRemote: 1; - DWORD m_xLoginStarted: 1; // »ç¿ëÀÚ°¡ Á÷Á¢ °ªÀ» SettingÇØ¾ß ÇÑ´Ù. - DWORD m_xLoginOK: 1; // »ç¿ëÀÚ°¡ Á÷Á¢ °ªÀ» SettingÇØ¾ß ÇÑ´Ù. + DWORD m_xLoginStarted: 1; // Must be set directly by the caller. + DWORD m_xLoginOK: 1; // Must be set directly by the caller. } m_DW; DWORD m_dwVarFlags; }; diff --git a/Gameleap/code/Launcher/nonmfc.h b/Gameleap/code/Launcher/nonmfc.h index 0802a8a3..cfbf5f2a 100644 --- a/Gameleap/code/Launcher/nonmfc.h +++ b/Gameleap/code/Launcher/nonmfc.h @@ -6,7 +6,7 @@ inline BOOL AssertDialog(const char* pcszExpr, const char* pcszfile, int nLine) { char szBuf[MAX_PATH * 2]; - sprintf(szBuf, "\"%s\" ÆÄÀÏÀÇ %dÁÙ¿¡¼­ ASSERT!!!\n\nµð¹ö±ëÀ» ÇϽðڽÀ´Ï±î?", pcszfile, nLine); + sprintf(szBuf, "ASSERT!!! in \"%s\" at line %d\n\nDo you want to debug?", pcszfile, nLine); #ifdef WIN32 return ::MessageBox(NULL, szBuf, pcszExpr, MB_YESNO) == IDYES; diff --git a/Gameleap/code/ctcls/nonmfc.h b/Gameleap/code/ctcls/nonmfc.h index 0802a8a3..cfbf5f2a 100644 --- a/Gameleap/code/ctcls/nonmfc.h +++ b/Gameleap/code/ctcls/nonmfc.h @@ -6,7 +6,7 @@ inline BOOL AssertDialog(const char* pcszExpr, const char* pcszfile, int nLine) { char szBuf[MAX_PATH * 2]; - sprintf(szBuf, "\"%s\" ÆÄÀÏÀÇ %dÁÙ¿¡¼­ ASSERT!!!\n\nµð¹ö±ëÀ» ÇϽðڽÀ´Ï±î?", pcszfile, nLine); + sprintf(szBuf, "ASSERT!!! in \"%s\" at line %d\n\nDo you want to debug?", pcszfile, nLine); #ifdef WIN32 return ::MessageBox(NULL, szBuf, pcszExpr, MB_YESNO) == IDYES; diff --git a/Gameleap/code/mw4/Code/AI test/ai command.hpp b/Gameleap/code/mw4/Code/AI test/ai command.hpp index 389d0677..6cf8d41e 100644 --- a/Gameleap/code/mw4/Code/AI test/ai command.hpp +++ b/Gameleap/code/mw4/Code/AI test/ai command.hpp @@ -76,18 +76,18 @@ typedef struct typedef struct { -//· code for changing sort order or priority levels -//· new sort order -//· new priority level -//· priority set to remove -//· priority set to add +//· code for changing sort order or priority levels +//· new sort order +//· new priority level +//· priority set to remove +//· priority set to add } AdjustCommandData; typedef struct { -//· command area from which to remove command -//· command id of command to remove -//· other info to pick what command to remove +//· command area from which to remove command +//· command id of command to remove +//· other info to pick what command to remove } RemoveCommandData; union CommandUnion diff --git a/Gameleap/code/mw4/Code/MW4/@save_criomain.cpp b/Gameleap/code/mw4/Code/MW4/@save_criomain.cpp index 4289eae8..c5b70f25 100644 --- a/Gameleap/code/mw4/Code/MW4/@save_criomain.cpp +++ b/Gameleap/code/mw4/Code/MW4/@save_criomain.cpp @@ -104,8 +104,8 @@ void CRIOMAIN::UpdateJoystickY (DIJOYSTATE &js) lJ = JoystickY_Center - g_JoystickY; - // °í°¨µµ - // Dead Zone ¿¡¼­ ¹þ¾î³­ ½ÃÁ¡À» 0À¸·Î °è»êÇÑ´Ù + // High sensitivity + // Calculate from the moment of exiting the Dead Zone as 0 if (lJ > 0) { lJ -= DEADZONE_JOYSTICK; } else if (lJ < 0) { diff --git a/Gameleap/code/mw4/Code/MW4/GUIRadarManager.cpp b/Gameleap/code/mw4/Code/MW4/GUIRadarManager.cpp index afb0dbd1..ab501717 100644 --- a/Gameleap/code/mw4/Code/MW4/GUIRadarManager.cpp +++ b/Gameleap/code/mw4/Code/MW4/GUIRadarManager.cpp @@ -19,16 +19,16 @@ #include #include "MWObject.hpp" -//»óÈƯ begin +//sanghoon begin #include #include #include #include #define RADAR_SCALE 2.8f -//»óÈƯ end +//sanghoon end -int m_gCool; // úè +int m_gCool; // hyun: coolant namespace MW4AI { @@ -121,22 +121,22 @@ GUIRadarManager::GUIRadarManager() : //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -//»óÈÆ +//sanghoon extern bool sh_game_started; GUIRadarManager::~GUIRadarManager() { - //»óÈÆ ¾Õ + //sanghoon begin sh_game_started=false; - //»óÈÆ µÚ + //sanghoon end delete m_RangeText; } void DrawMapBoundary() { - //DrawImplementation¿¡¼­ ÃßÃâÇØ¿ÔÀ½.. - //¹Ì¼ÇÀÌ ½ÃÀÛÇÑ ÈÄ Çѹø¸¸ ±×¸®°ÔµÈ´Ù.(¸Ê»óÀÇ ÀÛÀü ¿µ¿ªÀº º¯ÇÏÁö ¾ÊÀ¸¹Ç·Î..) + //Extracted from DrawImplementation.. + //Drawn only once after mission start (operation area on map does not change..) Scalar multx,multz; multx = 200.0f/(MW4AI::MaxX - MW4AI::MinX); @@ -148,7 +148,7 @@ void DrawMapBoundary() int numpts = ptlist.GetLength (); HDC hdcBackImage; - radar_device.pDDSBackground->GetDC( &hdcBackImage);//¹é¹öÆÛ Áغñ¿ë.. À̹ÌÁö.. + radar_device.pDDSBackground->GetDC( &hdcBackImage);//Image for back buffer preparation.. HPEN hpenold=(HPEN)SelectObject(hdcBackImage,CreatePen(PS_SOLID,1,RGB(255,0,0))); for (int i=0;inetworkingFlag; if (!networking) m_RadarMode = 0; - //»óÈÆ + //sanghoon if(hsh_initialized) DrawMapBoundary(); } -//»óÈÆ ¾Õ +//sanghoon begin /* char * radar_text[]={ "JUMP\nJET","SHUT\nDOWN","OVER\nRIDE","FLUSH","CROUCH","", "RANGE","RADAR\nMODE","LIGHT\nAMP","SEARCH\nLIGHT","AUTO\nCENTER" }; */ -//»óÈÆ µÚ +//sanghoon end //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // @@ -246,7 +246,7 @@ if(!hsh_initialized){ Check_Pointer(vehicle); Check_Pointer(vehicle->GetSensor()); /* - //»óÈÆ ¾Õ ¸Ê + //sanghoon begin: map Scalar multx,multz; multx = 200.0f/(MW4AI::MaxX - MW4AI::MinX); @@ -655,7 +655,7 @@ if(!hsh_initialized){ int i; // Secondary Maps - //¸Ê°ú ¸Ê °æ°è¼±À» ±×¸°´Ù. (°ÔÀÓÁß¿¡ º¯ÇÏÁö ¾ÊÀ¸¹Ç·Î Çѹø¸¸ ±×¸°´Ù.) + //Draw map and boundary. (Drawn once since it does not change during game.) if(!radar_device.MapDrawn){ extern char AssetsDirectory1[MAX_PATH]; @@ -724,8 +724,8 @@ if(!hsh_initialized){ Check_Pointer(vehicle->GetSensor()); - ///////////////////// MAP ½ÃÀÛ ////////////////////// - /////Torso Sweep±×¸®±â.. ½ÃÀÛ + ///////////////////// MAP BEGIN ////////////////////// + /////Torso Sweep draw.. begin Scalar multx,multz; multx = 200.0f/(MW4AI::MaxX - MW4AI::MinX); @@ -759,16 +759,16 @@ if(!hsh_initialized){ radar_device.DrawQuad(-pos.x+240-1,-pos.y+508-1,-pos.x+240+2,-pos.y+508+2,0xFF0000C0); } - /////Torso Sweep±×¸®±â.. ³¡ + /////Torso Sweep draw.. end - //¸Ê»ó¿¡ ¿ÀºêÁ§Æ®µé ±×¸®±â. + //Draw objects on map. { radar_device.pD3DDevice->SetTexture(0,radar_device.pDDSTexture); MWObject *hsh_current_object; for(i=0;iGetSensor()->numberOfContacts;i++){ hsh_current_object=vehicle->GetSensor()->GetSensorData()[i]->object.GetCurrent(); if (hsh_current_object != NULL){ - bool draw_contact = true;//ÇØ´ç ¿ÀºêÁ§Æ®¸¦ ±×¸±°ÍÀÎÁö..¿¡´ëÇÑ Ç÷¡±×.. + bool draw_contact = true;//Flag: whether to draw this object.. // MSL 5.02 Bot on Map if (hsh_current_object->GetAI()==NULL && (MWApplication::GetInstance()->networkingFlag == false))draw_contact = false; @@ -833,10 +833,10 @@ if(!hsh_initialized){ } } - ///////////////////// MAP ³¡ ////////////////////// + ///////////////////// MAP END ////////////////////// - ///////////////////// RADAR ½ÃÀÛ ////////////////////// + ///////////////////// RADAR BEGIN ////////////////////// radar_device.pD3DDevice->SetTexture(0,0); @@ -855,7 +855,7 @@ if(!hsh_initialized){ world_to_vehicle.Invert(vehicle_to_world); - // °æ°è¼± ±×¸®±â.. + // Draw boundary line.. Mission *miss; miss = Mission::GetInstance (); @@ -900,7 +900,7 @@ if(!hsh_initialized){ } - //Torso View±×¸®±â.. + //Draw Torso View.. //HSH_RenderRadarTorsoView(-m_TorsoTwist); radar_device.pD3DDevice->SetTexture(0,radar_device.pDDSTexture); radar_device.pD3DDevice->SetRenderState( D3DRENDERSTATE_ALPHABLENDENABLE, TRUE ); @@ -914,7 +914,7 @@ if(!hsh_initialized){ radar_device.pD3DDevice->SetTextureStageState(0,D3DTSS_MAGFILTER, D3DTFG_POINT ); radar_device.pD3DDevice->SetTextureStageState(0,D3DTSS_MINFILTER, D3DTFG_POINT ); - //Radar¹üÀ§ ±×¸®±â. + //Draw Radar range. char text[10]; if (radarRange != radarRangeOrg) sprintf (text,"NoLmt"); @@ -923,11 +923,11 @@ if(!hsh_initialized){ //HSH_DrawRadarNumber(345,386,text,1); radar_device.pFont[1].DrawText(80,350,0xFFFFFFFF,text,TEXTALIGN_ORG); - //ActiveMode±×¸®±â.. + //Draw ActiveMode.. char* modechar=(vehicle->GetSensor ()->GetSensorMode () == Sensor::ActiveMode)?"Active":"Passive"; radar_device.pFont[1].DrawText(395,350,0xFFFFFF,modechar,TEXTALIGN_ORG); - //ºôµù ±×¸®±â + //Draw buildings. MWObject *current_object; for(i=0;iGetSensor()->numberOfBuildingContacts;i++) { @@ -993,7 +993,7 @@ if(!hsh_initialized){ } } - //Object±×¸®±â. + //Draw Objects. for(i=0;iGetSensor()->numberOfContacts;i++){ current_object=vehicle->GetSensor()->GetSensorData()[i]->object.GetCurrent(); if (current_object != NULL){ @@ -1081,7 +1081,7 @@ if(!hsh_initialized){ } } - //Navigation Point±×¸®±â. + //Draw Navigation Points. j=0; ChainIteratorOf iter (NavPoint::s_RevealedNavPoints); NavPoint *nav; @@ -1136,7 +1136,7 @@ if(!hsh_initialized){ radar_device.DrawTexture(posx2,posy2,0xFFFFFFFF,(60+id*12),0,(60+id*12)+12,12); } - ///////////////////// RADAR ³¡ ////////////////////// + ///////////////////// RADAR END ////////////////////// } } @@ -1586,23 +1586,23 @@ if(!hsh_initialized){ DWORD color = MakeColor (64,64,64,255); - //¸·´ë °ÔÀÌÁöÀÇ ¹é±×¶ó¿îµå.. ±âÁØ.. + //Bar gauge background baseline.. m_Textures[1]->Draw (loc,size,color,HUDTexture::NO_FLIP,true); color = MakeColor (255,255,255,255); loc.y += size.y - targetyval; size.y = (Scalar) targetyval; m_Textures[0]->TopLeft (m_Textures[0]->Left (),(Scalar) (m_BaseBottom - targetyval)); m_Textures[0]->BlendMode (gos_BlendDecal); - //»ï»ö ¸·´ë °ÔÀÌÁö ±×¸®±â..(clipping size¸¦ Á¶ÀýÇÔÀ¸·Î½á.. °ªÀ» Á¶ÀýÇÏ´Â È¿°ú¸¦ ³ªÅ¸³½´Ù.) + //Draw tri-color bar gauge.. (value adjusted by modifying clip size..) m_Textures[0]->Draw (loc,size,color,HUDTexture::NO_FLIP); color = MakeColor (0,125,0,250); size = Size (); loc = Location (); - //¸·´ë °ÔÀÌÁöÀÇ ÇÁ·¹ÀÓ. + //Bar gauge frame. DrawFrame ((int) (loc.x-2),(int) (loc.y-2),(int) (loc.x+size.x),(int) (loc.y+size.y),color); - //¿Âµµ ÅؽºÆ®ÀÇ ÇÁ·¹ÀÓ.. + //Temperature text frame.. DrawFrame (261,542,303,560,color); m_HeatText->TopLeft (261,542); m_HeatText->BottomRight (303,560); @@ -1611,23 +1611,23 @@ if(!hsh_initialized){ DWORD textw,texth; m_HeatText->DrawSize (textw,texth); - //¿Âµµ¸¦ Á¤ÇØÁø »öÀ¸·Î Ãâ·ÂÇÑ´Ù.(°ÔÀÌÁö´Â ÅؽºÃÄÀ̹ǷΠ»öÀ» ÁöÁ¤ÇÒ ÇÊ¿ä°¡ ¾ø´Ù.) + //Display temperature in its designated color. (Gauge is a texture, no color spec needed.) m_HeatText->Draw (Point3D (282.0f - (textw/2.0f),551.0f - (texth/2.0f),0.9f)); DrawLine (304,549,310,549,color); DrawLine (309,(int) heaty,309,549,color); DrawLine ((int) (loc.x-2),(int) (heaty),309,(int) (heaty),color); }else if(sh_step==1){ - //radar manager´Â shutdown ½Ã¿¡ È£ÃâµÇÁö ¾ÊÀ¸¹Ç·Î.. ¿©±â¼­ Ãß°¡ÀûÀ¸·Î state¸¦ ¾÷µ¥ÀÌÆ® ½ÃÄÑÁØ´Ù. + //radar manager is not called on shutdown.. state updated additionally here. MechWarrior4::VehicleInterface* p = MechWarrior4::VehicleInterface::GetInstance(); p->GetGUIRadarStates(radar_device.recent_state); int targetyval = (int) ((m_Heat * 23)/100.0f); Clamp (targetyval,0,22); - //heatÀÇ ¹üÀ§´Â??? 0~100??? + //What is the range of heat??? 0~100??? - //targetÀº ±×¸®Áö ¾Ê°í ÇöÀç ¿Âµµ¸¸ ±×¸°´Ù. + //Draw current temperature only, without the target. float sizey=256; - //»ï»ö ¸·´ë °ÔÀÌÁö ±×¸®±â..(clipping size¸¦ Á¶ÀýÇÔÀ¸·Î½á.. °ªÀ» Á¶ÀýÇÏ´Â È¿°ú¸¦ ³ªÅ¸³½´Ù.) + //Draw tri-color bar gauge.. (value adjusted by modifying clip size..) { radar_device.pD3DDevice->SetTexture(0,radar_device.pDDSTexture); //backbground image @@ -1642,7 +1642,7 @@ if(!hsh_initialized){ radar_device.pD3DDevice->SetTexture(0,0); radar_device.DrawFrame(54-1,630-188-3,80+1,630+3,0xFFFFFFFF); } - //ÅؽºÆ® + //Text { char buf[16]; // MSL 5.02 Heat Scale Header @@ -1664,7 +1664,7 @@ HUDJump::HUDJump () m_TargetJump = -1.0f; Location (Point3D (467,539,0.9f)); Size (Point3D (7,49,0.9f)); - //j¶ó°í ÇÏ´Â ÀÛÀº ±ÛÀÚ... <==½ÇÁ¦·Î´Â Àß º¸ÀÌÁö ¾Ê´Â´Ù. + //Small 'j' character... <==actually barely visible. AddTexture ("hud\\hud4",0,98,200,106,207); } @@ -1703,14 +1703,14 @@ if(!hsh_initialized){ size = Size (); loc = Location (); - DWORD color = MakeColor (255,255,255,250); // ¿ø·¡ 255,255,255,250À̾úÀ½ - //j¶ó°í ÇÏ´Â ÀÛÀº ±ÛÀÚ... + DWORD color = MakeColor (255,255,255,250); // was originally 255,255,255,250 + //Small 'j' character... m_Textures[0]->Draw (Point3D (loc.x+2,loc.y - m_Textures[0]->Size().y-2.0f,0.9f),m_Textures[0]->Size (),color); int targetyval = (int) (m_Jump * size.y); color = MakeColor (0,125,0,250); - //³ì»ö °ÔÀÌÁö.. + //Green gauge.. my_DrawRect ((int) (loc.x),(int) (loc.y+size.y-targetyval),(int) (loc.x+size.x),(int) (loc.y+size.y),color); if ((m_Jump != 0) && (m_Alpha != 0)) { @@ -1718,11 +1718,11 @@ if(!hsh_initialized){ my_DrawRect ((int) (loc.x),(int) (loc.y+size.y-targetyval),(int) (loc.x+size.x),(int) (loc.y+size.y),color); } - //°ÔÀÌÁö ¸ÇÀ§ÀÇ Èò¼±.. + //White line at the top of gauge.. color = MakeColor (255,255,255,200); DrawLine ((int) (loc.x),(int) (loc.y+size.y-targetyval),(int) (loc.x+size.x),(int) (loc.y+size.y-targetyval),color); - //Å׵θ® ±×¸®±â.. + //Draw border.. color = MakeColor (0,125,0,250); DrawFrame ((int) loc.x,(int) (loc.y),(int) (loc.x+size.x),(int) (loc.y+size.y),color); }else if(sh_step==1){ @@ -1736,7 +1736,7 @@ if(!hsh_initialized){ } } -//Àü¹ÝÀûÀ¸·Î jumpjet°ú °ÅÀÇ °°´Ù. +//Overall almost identical to jumpjet. HUDCoolant::HUDCoolant () { m_Alpha = 255; @@ -1745,7 +1745,7 @@ HUDCoolant::HUDCoolant () m_Cool = 100; Location (Point3D (332,539,0.9f)); Size (Point3D (7,49,0.9f)); - //C¶ó°í ÇÏ´Â ÀÛÀº ±ÛÀÚ.. + //Small 'C' character.. AddTexture ("hud\\hud4",0,88,200,96,207); } @@ -1782,7 +1782,7 @@ if(!hsh_initialized){ loc = Location (); DWORD color = MakeColor (0,125,0,250); - //C¶ó°í ÇÏ´Â ÀÛÀº ±ÛÀÚ.. + //Small 'C' character.. m_Textures[0]->Draw (Point3D (loc.x+2,loc.y - m_Textures[0]->Size().y-2.0f,0.9f),m_Textures[0]->Size (),color); m_gCool = m_Cool; @@ -1790,19 +1790,19 @@ if(!hsh_initialized){ Clamp (targetyval,0,(int) size.y); color = MakeColor (0,100,255,250); - //°ÔÀÌÁö ±×¸®±â.. + //Draw gauge.. my_DrawRect ((int) (loc.x),(int) (loc.y+size.y-targetyval),(int) (loc.x+size.x),(int) (loc.y+size.y),color); if ((m_Cool != 0) && (m_Alpha != 0)) { - //flushÇßÀ»¶§.. Èò»öÀ¸·Î ±ô¹ÚÀÌ´Â È¿°ú ±×¸®±â... + //When flushed.. draw white blinking effect... color = MakeColor (255,255,255,m_Alpha); my_DrawRect ((int) (loc.x),(int) (loc.y+size.y-targetyval),(int) (loc.x+size.x),(int) (loc.y+size.y),color); } color = MakeColor (255,255,255,200); - //°ÔÀÌÁö À§ÂÊÀÇ Èò¼±.. + //White line above gauge.. DrawLine ((int) (loc.x),(int) (loc.y+size.y-targetyval),(int) (loc.x+size.x),(int) (loc.y+size.y-targetyval),color); - //°ÔÀÌÁö¸¦ µÑ·¯½Î´Â ÇÁ·¹ÀÓ.. + //Frame surrounding gauge.. color = MakeColor (0,125,0,250); DrawFrame ((int) loc.x,(int) (loc.y),(int) (loc.x+size.x),(int) (loc.y+size.y),color); }else if(sh_step==1){ @@ -1817,7 +1817,7 @@ if(!hsh_initialized){ } -//¼Óµµ¸¦ ³ªÅ¸³»´Â... HUD Component +//HUD Component displaying speed... namespace NHUDSPEED { // const int for_speed_box[12] = {0,4,8,12,16,20,24,28,32,36,40,44}; @@ -1928,25 +1928,25 @@ if(!hsh_initialized){ speedy = loc.y + 56 - fred; DWORD color = MakeColor (255,255,255,255); - //°ÔÀÌÁö ¹é±×¶ó¿îµå ´«±Ý.. + //Gauge background tick marks.. m_Textures[1]->Draw (loc,size,color,HUDTexture::NO_FLIP,true); loc.y += top; size.y = (Scalar) bottom - top; - //»ï»ö ¸·´ë °ÔÀÌÁö ±×¸®±â..(clipping size¸¦ Á¶ÀýÇÔÀ¸·Î½á.. °ªÀ» Á¶ÀýÇÏ´Â È¿°ú¸¦ ³ªÅ¸³½´Ù.) + //Draw tri-color bar gauge.. (value adjusted by modifying clip size..) m_Textures[0]->TopLeft (m_Textures[0]->Left (),(Scalar) (top)); m_Textures[0]->BottomRight (m_Textures[0]->Right (),(Scalar) (bottom)); m_Textures[0]->BlendMode (gos_BlendDecal); - //colored °ÔÀÌÁö..³ì»öÀ¸·Î µÇ¾î ÀÖ´Ù. + //Colored gauge.. currently green. m_Textures[0]->Draw (loc,size,color,HUDTexture::NO_FLIP,true); color = MakeColor (0,125,0,250); size = Size (); loc = Location (); - //°ÔÀÌÁö¸¦ µÑ·¯½Î´Â.. ÇÁ·¹ÀÓ ±×¸®±â.. + //Draw frame surrounding gauge.. DrawFrame ((int) (loc.x-2),(int) (loc.y-2),(int) (loc.x+size.x),(int) (loc.y+size.y),color); - //¼Óµµ Ç¥½ÃÇÏ´Â ÇÁ·¹ÀÓ... + //Speed display frame... DrawFrame (506,537,548,555,color); m_SpeedText->TopLeft (506,537); m_SpeedText->BottomRight (548,555); @@ -1958,15 +1958,15 @@ if(!hsh_initialized){ DWORD textw,texth; m_SpeedText->DrawSize (textw,texth); - //¼Óµµ Ç¥½ÃÇÏ´Â ÅؽºÆ®.. ¾Õ/µÚ ¹æÇâ¿¡ µû¶ó¼­ »öÀÌ ³ì½Ä/ÆĶõ»ö.....À¸·Î µÈ´Ù. + //Speed text.. color is green/blue depending on forward/backward direction..... m_SpeedText->Draw (Point3D (527.0f - (textw/2.0f),546.0f - (texth/2.0f),0.9f)); - //¼ÓµµÇÁ·¹ÀÓ-°ÔÀÌÁö ÇÁ·¹ÀÓ ¿¬°áÇÏ´Â 3 segment¶óÀÎ.. + //3-segment line connecting speed frame to gauge frame.. DrawLine (498,549,506,549,color); DrawLine (498,(int) speedy,498,549,color); DrawLine ((int) (loc.x+size.x+2),(int) (speedy),498,(int) (speedy),color); }else if(sh_step==1){ - //ÀûÀýÇÏÁö´Â ¾ÊÁö¸¸.. ¹Ì¼Ç ½Ã°£À» speed¿¡¼­ °°ÀÌ ±×¸°´Ù. - //¹Ì¼Ç ½Ã°£ ±×¸®±â...hudtimer.cpp¿¡ DrawImplementation¿¡¼­ µû¿Â°ÍÀÓ.. + //Not ideal, but draw mission time alongside speed display. + //Draw mission timer... taken from DrawImplementation in hudtimer.cpp.. { MWMission *mwmiss = Cast_Object (MWMission *,Mission::GetInstance ()); Verify (mwmiss); @@ -1983,7 +1983,7 @@ if(!hsh_initialized){ } float offset; - //126,62.. 188ÀÇ ¼Óµµ.. 2:1·Î ³ª´©¸é.. + //126,62.. speed 188.. divided 2:1.. //backbground image radar_device.pD3DDevice->SetTexture(0,radar_device.pDDSTexture); @@ -2094,8 +2094,8 @@ HUDNav::HUDNav() navPointName = new HUDText (); navPointRange = new HUDNumberText (); playerAngle = new HUDNumberText (); - navPointRange->SetSize (HUDText::MEDIUM_SIZE); // ¿ø·¡ SMALL_SIZE¿´À½ - playerAngle->SetSize (HUDText::MEDIUM_SIZE); // ¿ø·¡ SMALL_SIZE¿´À½ + navPointRange->SetSize (HUDText::MEDIUM_SIZE); // was originally SMALL_SIZE + playerAngle->SetSize (HUDText::MEDIUM_SIZE); // was originally SMALL_SIZE m_NavAlphaTime = 0; @@ -2203,14 +2203,14 @@ if(!hsh_initialized){ m_Textures[10]->TopLeft ((Scalar) (m_BaseLeft + offset),m_Textures[10]->Top ()); size = m_Textures[10]->Size (); m_Textures[10]->Draw (loc,size,color,HUDTexture::NO_FLIP,true); - //2¹ø auxÀÇ ÁÙÀÚ..ÀÇ ´ëºÎºÐ...(À̰ɷΠǥ½ÃµÇÁö ¾ÊÀ»¶§.. ´ÙÀ½°É·Î Ç¥½ÃÇÑ´Ù.) + //Main portion of aux2 ruler... (if not displayable here, use next one.) #if 1 loc.x += size.x; loc.x-=1; m_Textures[13]->BottomRight ((Scalar) m_BaseLeft+offset,m_Textures[13]->Bottom ()); size = m_Textures[13]->Size (); m_Textures[13]->Draw (loc,size,color,HUDTexture::NO_FLIP,true); - //2¹ø auxÀÇ ÁÙÀÚÀÇ ¤FÀº ºÎºÐ.... + //Short tick marks of aux2 ruler.... #endif int heading = m_PlayerFacing; @@ -2223,7 +2223,7 @@ if(!hsh_initialized){ bool draw = false; if (dir < 0) dir += 360; - else if (dir > 360)//»óÈÆ °íħ.. ¿ø·¡´Â --> "else if (dir > 360)" ¿´À½.. + else if (dir > 360)//sanghoon fix: original was --> "else if (dir > 360)".. dir -= 360; switch (dir) { @@ -2265,11 +2265,11 @@ if(!hsh_initialized){ navText[textid]->DrawSize (dx,dy); textloc.x -= dx/2; navText[textid]->Draw (textloc); - //2¹ø aux¹æÀ§°¢ Ç¥½Ã.. 340 350 N 10 20... + //Aux2 bearing display.. 340 350 N 10 20... } } - //2¹ø aux mechÀÇ ¹æÇâ°¢µµ Ç¥½Ã... + //Aux2 mech heading angle display... color = Color (); DrawFrame (400-13,10,400+13,22,color); DWORD dx,dy; @@ -2288,7 +2288,7 @@ if(!hsh_initialized){ size = m_Textures[11]->Size (); color = Color (); m_Textures[11]->Draw (Point3D (400.0f,44.0f,0.9f),size,color); - //2¹ø aux Áß½ÉÇ¥½Ã.. ¿ª»ï°¢Çü..(¸Å¿ìÀÛÀ½) + //Aux2 center indicator.. inverted triangle.. (very small) if (m_NavPointRange != -1) { @@ -2299,9 +2299,9 @@ if(!hsh_initialized){ textloc.y = 0; textloc.z = 0; // Draw navpoint bug or arrows - //2¹ø aux navigation - //navpoint bug:... ¸ñÇ¥¸¦ ³ªÅ¸³»´Â µ¿±×¶ó¹Ì¸¦ ¹ßÇÑ´Ù.(ruler¾È¿¡ Ç¥½Ã°¡´ÉÇÒ¶§) - //arrow ruler¾È¿¡ Ç¥½Ã°¡ ºÒ°¡´ÉÇÒ¶§.. ¹æÇ⸸ ÁÂ/¿ì È­»ìÇ¥·Î¼­ Ç¥½ÃÇÑ´Ù. + //Aux2 navigation + //navpoint: draw circle indicating objective (when displayable in ruler) + //When unable to display in arrow ruler.. show direction with left/right arrow only. DWORD color = (m_NavAlpha << 24) + 0x00AF00; size = Size (); @@ -2346,7 +2346,7 @@ if(!hsh_initialized){ textloc.y += 5; textloc.z = 0.9f; } - //ÁöÁ¡ ŸÄÏÀÇ À̸§À» ±×¸°´Ù. + //Draw the name of the point target. DWORD dx,dy; navPointName->TopLeft (textloc.x-50.0f,textloc.y-2.0f); navPointName->BottomRight (textloc.x+50.0f,textloc.y+20.0f); @@ -2357,7 +2357,7 @@ if(!hsh_initialized){ navPointName->Draw (textloc); textloc.x += dx/2; - //ÁöÁ¡ ŸÄÏÀÇ °Å¸®¸¦ ±×¸°´Ù. + //Draw distance to point target. textloc.y += 12.0f; navPointName->TopLeft (textloc.x-50.0f,textloc.y-2.0f); navPointName->BottomRight (textloc.x+50.0f,textloc.y+20.0f); @@ -2503,7 +2503,7 @@ if(!hsh_initialized){ if(VehGetShutdownState()!=1) { mfd_device.DrawTexture(120,140,0xFFFFFFFF,testoffset+1,256,testoffset+402+1,256+18); - //´«±ÝÀ§ÀÇ ¹æÀ§°¢ ±×¸®±â + //Draw bearing above tick marks int heading = m_PlayerFacing; int ii=0; for (int i=heading-20;i<=heading+20;i++,ii++){ @@ -2521,7 +2521,7 @@ if(!hsh_initialized){ } mfd_device.pD3DDevice->SetTexture(0,0); - //ÇöÀç ¹æÀ§°¢ ±×¸®±â + //Draw current bearing { char text[8]; wsprintf(text,"%d",(int)m_PlayerFacing); @@ -2530,19 +2530,19 @@ if(!hsh_initialized){ } mfd_device.pD3DDevice->SetTexture(0,mfd_device.pDDSTexture); - //Áß½ÉÇ¥½Ã ¿ª»ï°¢Çü(¸Å¿ìÀÛÀ½) ±×¸®±â + //Draw center-indicator inverted triangle (very small) mfd_device.DrawTexture(320-5,140,0xFFFFFFFF,59,30+256,70,39+256); - //¸ñÇ¥ ±×¸®±â. - if (m_NavPointRange != -1){//¸ñÇ¥ ÁöÁ¡ÀÌ ÀÖÀ»¶§. + //Draw objective. + if (m_NavPointRange != -1){//when a target waypoint exists. int hsh_textpos=0; - //¸ñÇ¥ Ç¥½Ã ±×¸®±â. + //Draw objective indicator. if ((m_NavPointFacing > -20) && (m_NavPointFacing < 20)){ - //¹æÀ§°¢ ³»¿¡ ÀÖÀ»¶§.. ¹ö±×¸¦ ±×¸°´Ù. + //When inside bearing range.. draw indicator. mfd_device.DrawTexture((int)(320-9-m_NavPointFacing*10),140+4,0xFFFFFFFF,87,28+256,106,47+256); hsh_textpos=(int)(320-m_NavPointFacing*10); }else{ - //¹æÀ§°¢ ¹Û¿¡ ÀÖÀ»¶§.. È­»ìÇ¥¸¦ ±×¸°´Ù. + //When outside bearing range.. draw arrow. if (m_NavPointFacing <= -10){ mfd_device.DrawTexture(520+4,140,0xFFFFFFFF,3,54+256,39,81+256); hsh_textpos=520; @@ -2552,12 +2552,12 @@ if(!hsh_initialized){ } } - //¸ñÇ¥ À̸§°ú °Å¸®(ÅؽºÆ®) ±×¸®±â. + //Draw objective name and distance (text). mfd_device.pFont[0].DrawText(hsh_textpos,140+26,0xFFFFFFFF,m_NavPointName,TEXTALIGN_CENTER); mfd_device.pFont[0].DrawText(hsh_textpos,140+46,0xFFFFFFFF,m_NavPointRangeText,TEXTALIGN_CENTER); } } - //¹Ýµå½Ã.. scroeÁ¤º¸ ±×¸®´Â ·çƾÀ» Ãß°¡ÇÒ°Í.. + //Must add routine to draw score info here.. { char score[32]={0}; char kills[32]={0}; diff --git a/Gameleap/code/mw4/Code/MW4/GUIRadarManager.hpp b/Gameleap/code/mw4/Code/MW4/GUIRadarManager.hpp index e77d10a4..451bbba3 100644 --- a/Gameleap/code/mw4/Code/MW4/GUIRadarManager.hpp +++ b/Gameleap/code/mw4/Code/MW4/GUIRadarManager.hpp @@ -51,9 +51,9 @@ namespace MechWarrior4 Stuff::Scalar m_TorsoTwist; int m_RadarMode; stlport::vector m_ShotList; - //»óÈÆ ¾Õ + //sanghoon begin int hsh_fdraw; - //»óÈÆ µÚ + //sanghoon end bool OnShotList (ObjectID who); void ClipLine (Scalar& xpt1,Scalar& ypt1,Scalar& xpt2,Scalar& ypt2,Scalar cx,Scalar cy,Scalar rad); diff --git a/Gameleap/code/mw4/Code/MW4/MW4.cpp b/Gameleap/code/mw4/Code/MW4/MW4.cpp index 5bf805d2..87faddff 100644 --- a/Gameleap/code/mw4/Code/MW4/MW4.cpp +++ b/Gameleap/code/mw4/Code/MW4/MW4.cpp @@ -121,7 +121,7 @@ void InitComFuncs (void); void KillComFuncs (void); -// úè - start +// hyun begin typedef long LONG; typedef struct DIJOYSTATE { LONG lX; @@ -141,7 +141,7 @@ extern void (__stdcall *g_pfnRIO_ButtonEvent)(BYTE* by); extern void __stdcall RIO_Joy(DIJOYSTATE& js); extern void __stdcall RIO_ButEvent(BYTE* by); -// úè - end +// hyun end namespace MW4AI { @@ -200,13 +200,13 @@ Stuff::Scalar MechWarrior4::DECRYPT (Stuff::Scalar value) void MechWarrior4::InitializeClasses(Stuff::NotationFile *startup_ini) { -// úè - start +// hyun begin if (g_bUseOrgJoy) g_pfnRIO_Joy = NULL; else g_pfnRIO_Joy = RIO_Joy; g_pfnRIO_ButtonEvent = RIO_ButEvent; -// úè - end +// hyun end Verify(!g_LibraryHeap); g_LibraryHeap = gos_CreateMemoryHeap("MechWarrior4(All)"); @@ -753,8 +753,8 @@ void gos_DestroyMemoryHeap(g_LibraryHeap); g_LibraryHeap = NULL; -// úè - start +// hyun begin g_pfnRIO_ButtonEvent = NULL; g_pfnRIO_Joy = NULL; -// úè - end +// hyun end } diff --git a/Gameleap/code/mw4/Code/MW4/MW4Shell.cpp b/Gameleap/code/mw4/Code/MW4/MW4Shell.cpp index ade612da..c5670abb 100644 --- a/Gameleap/code/mw4/Code/MW4/MW4Shell.cpp +++ b/Gameleap/code/mw4/Code/MW4/MW4Shell.cpp @@ -12980,10 +12980,10 @@ void CTCL_API CTCL_SetMissionParams() //} NetMissionParameters::MWNetMissionParameters* lparams = app->GetLocalNetParams(); - lparams->m_killLimit = 0; // no kill limit - ¸ñǥġ + lparams->m_killLimit = 0; // no kill limit - target value lparams->m_killLimitNumber = 0; - lparams->m_respawnLimit = 0; // »ý¸íÁ¦ÇÑÀ» µÑ °ÍÀΰ¡? - lparams->m_respawnLimitNumber = 0; // »ý¸í¼ö + lparams->m_respawnLimit = 0; // apply a respawn limit? + lparams->m_respawnLimitNumber = 0; // number of lives //params->m_isNight = params.m_isNight; lparams->m_onlyStockMech = FALSE; lparams->m_playMissionReview = 0; // params.m_playMissionReview; @@ -13250,7 +13250,7 @@ void CTCL_API CTCL_CheckServerReady() int i, nOK, nCount = Network::GetInstance()->GetPlayerCount(); BOOL bOK = FALSE; - if (nCount == (g_nTeslas + 1)) { // ¸ðµç Ŭ¶óÀ̾ðÆ®°¡ Á¢¼ÓÀÌ µÇ¾î ÀÖÀ» ¶§... + if (nCount == (g_nTeslas + 1)) { // when all clients are connected... for(nOK = 0, i = 0; i < Maximum_Players; ++i) { if (i != Connection::Server->GetID()) { const MechWarrior4::ServedConnectionData& scd = app->servedConnectionData[i]; diff --git a/Gameleap/code/mw4/Code/MW4/MWApplication.cpp b/Gameleap/code/mw4/Code/MW4/MWApplication.cpp index df40efda..26e3dc41 100644 --- a/Gameleap/code/mw4/Code/MW4/MWApplication.cpp +++ b/Gameleap/code/mw4/Code/MW4/MWApplication.cpp @@ -230,13 +230,13 @@ extern int g_nTeamOrderMode; extern bool g_bCOOP; // COin OPeration // jcem - end -// úè - start +// hyun begin extern void __stdcall RIO_StartStop (BOOL bStart); void COOP_InputMode(bool bRestore); extern int g_bNoPlasma; extern void __stdcall PLASMA_Do(int nMode); extern void GeneralReset(); -// úè - end +// hyun end extern bool __stdcall gos_NetDoneStartGame(); extern bool __stdcall PrepareDefaultServerAdvertisers(void); @@ -1938,9 +1938,9 @@ public: void EndPos (DWORD& x,DWORD& y); bool Empty (void) { return (m_Text[0] == 0); } - //»óÈÆ ¾Õ + //sanghoon begin const char *hsh_get_m_Text(){return &m_Text[0];} - //»óÈÆ µÚ + //sanghoon end }; TextBox::TextBox (const char* pcszFontName, int nFontSize/* = -11*/, bool oldmode/* = false*/) @@ -3571,9 +3571,9 @@ void } Environment.DoGameLogic = &MWApplication::DoGameLogic; } - // úè - start + // hyun begin RIO_StartStop (TRUE); - // úè - end + // hyun end g_MRF.Started(); // jcem g_RSF.Started(); // jcem @@ -3696,9 +3696,9 @@ void g_RSF.Stopping(); // jcem ClearTOC(); - // úè - start + // hyun begin RIO_StartStop (FALSE); - // úè - end + // hyun end if (CTCL_IsConsoleX()) { CTCL_SetGameState(_EGS_Closing); } @@ -3870,9 +3870,9 @@ sh_game_started = false; g_RSF.Stopping(); // jcem ClearTOC(); - // úè - start + // hyun begin RIO_StartStop (FALSE); - // úè - end + // hyun end if (CTCL_IsConsoleX()) { CTCL_SetGameState(_EGS_Closing); } @@ -18435,7 +18435,7 @@ int __stdcall CTCL_StartCOOP(void* instance, int args, void* data[]) // $$COOP: see void CSOC_Client::OnReadyStartGame() // C_ReadyStartGame - g_nTeslas = 0; // ½Ì±Û °ÔÀÓ + g_nTeslas = 0; // single player game g_nBOTs = 7; g_nPlayerInfos = 1 + g_nBOTs + g_nTeslas; g_bIsServer = TRUE; @@ -18523,13 +18523,13 @@ int __stdcall CTCL_StartCOOP(void* instance, int args, void* data[]) // MSL ADD MECH PI.m_nMechIndex = -1; //* -// °¢ ¸ÞÅ©¿¡ ´ëÇÑ Á¤º¸´Â MechIndex¸¦ ÂüÁ¶ÇÔ +// See MechIndex for each mech's info PI.m_fileID = 0; PI.m_recordID = 0; strcpy(PI.m_szMech, s_paMechNames[11]); // Madcat strcpy(PI.m_szMech, "$Yellow"); //*/ - PI.m_nTeamOrSkin = 1; // »¡°­ + PI.m_nTeamOrSkin = 1; // red PI.m_nDecal = 1; // nDecal; PI.m_dwAddr = 0; // dwAddr; g_nPrintOut = FALSE; @@ -18576,7 +18576,7 @@ int __stdcall CTCL_StartCOOP(void* instance, int args, void* data[]) strcpy(PI.m_szName, s_pNames[aLBN[2][i - 1]]); PI.m_nMechIndex = -1; //* - //°¢ ¸ÞÅ©¿¡ ´ëÇÑ Á¤º¸´Â MechIndex¸¦ ÂüÁ¶ÇÔ + //See MechIndex for each mech's info PI.m_fileID = 0; PI.m_recordID = 0; /*if (i == 1) diff --git a/Gameleap/code/mw4/Code/MW4/MWGUIManager.cpp b/Gameleap/code/mw4/Code/MW4/MWGUIManager.cpp index da9db25f..e2520a55 100644 --- a/Gameleap/code/mw4/Code/MW4/MWGUIManager.cpp +++ b/Gameleap/code/mw4/Code/MW4/MWGUIManager.cpp @@ -1,8 +1,8 @@ #include "MW4Headers.hpp" -//»óÈÆ ¾Õ +//sanghoon begin #include "MWVideoRenderer.hpp" -//»óÈÆ µÚ +//sanghoon end #include "MWGUIManager.hpp" #include "GUIWeaponManager.hpp" #include "GUIRadarManager.hpp" @@ -1554,7 +1554,7 @@ void MWGUIManager::RenderComponents (void) (*iter)->Draw (); } }else{ - //»óÈÆ... ¼Ë´Ù¿î ÁßÀ϶§.. + //sanghoon: while shutting down.. for (iter = m_Components.begin ();iter != m_Components.end ();iter++) { //Main hudZoom,//hudReticle,hudObjective,hudTorsoBar,hudHelp,hudScore @@ -1597,11 +1597,11 @@ void MWGUIManager::RenderComponents (void) } else { - //»óÈÆ-¾Õ + //sanghoon begin extern CamerashipParams g_CamerashipParams; if (CTCL_IsConsoleX() || g_CamerashipParams.m_bAllowChatDisplay) hudChat->Draw (true); - //»óÈÆ-µÚ + //sanghoon end hudScore->Draw (true); hudCamera->Draw(true); } @@ -1612,7 +1612,7 @@ void MWGUIManager::RenderComponents (void) gos_PopRenderStates (); -//»óÈÆ ¾Õ +//sanghoon begin MWApplication* app = MWApplication::GetInstance(); if (app->networkingFlag) { @@ -1648,7 +1648,7 @@ void MWGUIManager::RenderComponents (void) } } } -//»óÈÆ µÚ +//sanghoon end } void MWGUIManager::ShowHelpArrow (bool value) diff --git a/Gameleap/code/mw4/Code/MW4/MWMission.hpp b/Gameleap/code/mw4/Code/MW4/MWMission.hpp index 7c358f05..45d6fb51 100644 --- a/Gameleap/code/mw4/Code/MW4/MWMission.hpp +++ b/Gameleap/code/mw4/Code/MW4/MWMission.hpp @@ -590,7 +590,7 @@ namespace MechWarrior4 return (m_EndMissionTimer.Running()); } - //»óÈÆ + //sanghoon Stuff::Scalar GetMissionDuration () { if (!m_EndMissionTimer.Running ()) diff --git a/Gameleap/code/mw4/Code/MW4/Mech.cpp b/Gameleap/code/mw4/Code/MW4/Mech.cpp index 3015f17d..a74e4c0b 100644 --- a/Gameleap/code/mw4/Code/MW4/Mech.cpp +++ b/Gameleap/code/mw4/Code/MW4/Mech.cpp @@ -3954,7 +3954,7 @@ void g_HUDPPCLevel = 10; } -//»óÈÆ +//sanghoon //extern bool sh_isdeathmode; //Are we ejecting? if (m_NeedEject) diff --git a/Gameleap/code/mw4/Code/MW4/VehicleInterface.cpp b/Gameleap/code/mw4/Code/MW4/VehicleInterface.cpp index 9c0f47dd..11713ee2 100644 --- a/Gameleap/code/mw4/Code/MW4/VehicleInterface.cpp +++ b/Gameleap/code/mw4/Code/MW4/VehicleInterface.cpp @@ -13,7 +13,7 @@ // This unpublished sourcecode is PROPRIETARY and CONFIDENTIAL // //===========================================================================// -// úè - start +// hyun begin #include "MW4.hpp" #include "Vehicle.hpp" #include "MechAnimationState.hpp" @@ -22,7 +22,7 @@ #include "SpringOf.hpp" #include "MechLabHeaders.h" #include -// úè - end +// hyun end #include "MW4Headers.hpp" @@ -65,9 +65,9 @@ #include "EyePointManager.hpp" #include "mw4shell.hpp" #include "NavPoint.hpp" -//»óÈÆ ¾Õ +//sanghoon begin #include "MWVideoRenderer.hpp" -//»óÈÆ µÚ +//sanghoon end #include #include @@ -101,7 +101,7 @@ bool _stdcall WriteImageAfterGrab(BYTE* Image, const char* pcszFilePrefix); #include #define __mbsrchr(s,c) (char*)_mbsrchr((const unsigned char*)(s),(c)) -// úè - start +// hyun begin #include #include "ctcls.h" @@ -208,7 +208,7 @@ float g_fNeedFlushLevel = 0.66; float g_fTimeMsgSender = 1.5f; float g_fTimeScoringAtEnd = 10.0f; Mech* FindNextMechToFollowByScore(Mech* pCur); // jcem -// úè - end +// hyun end CamerashipParams g_CamerashipParams; @@ -2285,7 +2285,7 @@ void if (MWGUIManager::GetInstance () && IsObserving(true)) { Check_Object(MWGUIManager::GetInstance()); - //»óÈÆ + //sanghoon if (!CTCL_IsConsoleX() && !g_CamerashipParams.m_bAllowChatDisplay) { HUDChat *chat; chat = Cast_Object (HUDChat *,MWGUIManager::GetInstance ()->Component (MWGUIManager::HUD_CHAT)); @@ -3781,11 +3781,11 @@ void VehicleInterface::ApplyControls(Time till) } else if (controlPacket.lookCommand == AnalogControlSave::LookBack) { - //»óÈÆ + //sanghoon ShowHUDIfOn(true); //MWGUIManager::GetInstance()->HideHudComponent (HUD_TARGETARROW); //ShowHUDIfOn(false); - //»óÈÆ + //sanghoon // MSL 5.04 Rear Firing Weapons // ShowStatic(cameraView == InMechCameraView); ShowStatic(true); @@ -4968,7 +4968,7 @@ void Scalar fT = gos_GetElapsedTime(); if ((fT - g_fLastScoringTimeCechk) >= CAMERASHIP_SCORING_CHECK) { g_fLastScoringTimeCechk = fT; -//»óÈÆ +//sanghoon if (Application::GetInstance()->networkingFlag) { bool bNearEnd = false; @@ -5378,7 +5378,7 @@ again: if ((m_curView == STATE_DEATH_SEQUENCE_START) || (m_curView == STATE_DEATH_SEQUENCE_TRANS)) { bool bStateEnded = false; if (m_pMechDying != pMech) { - // Á×´Â µµÁß¿¡ Ÿ°ÙÀÌ ¹Ù²ï °æ¿ì + // Case where target changes while dying ClearFixedPoint(); m_fTimeStateEnd = fMT + g_CamerashipParams.m_fTimeStandard; m_pMechDying = m_pEnemy = NULL; @@ -5419,7 +5419,7 @@ again: } if ((m_pEnemy != m_pMechDying) && m_pEnemy->IsDestroyed()) { if (m_curView == STATE_DEATH_SEQUENCE_START) { - // Á×À½À» º¸¿©ÁÖ´Â µµÁß¿¡ »ó´ë¹æÀÌ Á×Àº °æ¿ì... + // Case where opponent dies while death animation is playing... // move to trans... bStateEnded = true; } @@ -7495,7 +7495,7 @@ void // MSL 5.02 Zoom // m_reticuleCamera->SetPerspective(near_clip_zoom, far_clip_main + (100.0f * (horizontal_fov_main - horizontal_fov_zoom)), horizontal_fov_zoom, (height_to_width_zoom)); m_reticuleCamera->SetPerspective(near_clip_zoom, far_clip_main + (100.0f * (horizontal_fov_main - horizontal_fov_zoom)), horizontal_fov_zoom, (height_to_width_zoom*1.75)); - //»óÈÆ + //sanghoon // float height=(1-g_fZoomMarginLR*2)*800 * height_to_width_zoom/600; // float tb_margin=(1-height)/2; // m_reticuleCamera->SetViewport(1-g_fZoomMarginLR,1-tb_margin, g_fZoomMarginLR, tb_margin); @@ -8121,7 +8121,7 @@ void VehicleInterface::ChainFireGroup (Stuff::Time till,ChainIteratorOfReadAndNext(); @@ -8135,7 +8135,7 @@ void VehicleInterface::ChainFireGroup (Stuff::Time till,ChainIteratorOf 0) && GetWeaponGroupID (*weapon, 3); // - // úè - end + // hyun end // num_weapons ++; @@ -8369,7 +8369,7 @@ void } } */ - // fireRequest > 0 (Enter Key : None Used) : úè + // fireRequest > 0 (Enter Key : None Used) : hyun if(fireRequest > 0) { switch(weaponMode) @@ -8521,12 +8521,12 @@ void VehicleInterface::OverrideAutoCenterToTorsoMessageHandler(Adept::ReceiverDa Verify(message->messageID == OverrideAutoCenterToTorsoMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (28, LAMP_OFF); // úè + g_pRIOMain->SetLampState (28, LAMP_OFF); // hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (28, LAMP_BRIGHT); // úè + g_pRIOMain->SetLampState (28, LAMP_BRIGHT); // hyun if (perminateTorsoMode == CenterLegsToTorso) { @@ -8539,7 +8539,7 @@ void VehicleInterface::OverrideAutoCenterToTorsoMessageHandler(Adept::ReceiverDa } else { - g_pRIOMain->SetLampState (28, LAMP_DEFAULT); // úè + g_pRIOMain->SetLampState (28, LAMP_DEFAULT); // hyun } } @@ -8658,11 +8658,11 @@ void } } - g_pRIOMain->SetLampState (17, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (17, LAMP_BRIGHT);// hyun } else { - g_pRIOMain->SetLampState (17, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (17, LAMP_DEFAULT);// hyun } } @@ -8749,17 +8749,17 @@ void Verify(message->messageID == CrouchCommandMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (20, LAMP_OFF);// úè + g_pRIOMain->SetLampState (20, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (20, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (20, LAMP_BRIGHT);// hyun // if (executionState->GetState () == ExecutionStateEngine::AutoPilotState) executionState->RequestState(ExecutionStateEngine::AlwaysExecuteState); QueCommand(VehicleCommand::CrouchCommand); } else { - g_pRIOMain->SetLampState (20, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (20, LAMP_DEFAULT);// hyun } } //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -8786,10 +8786,10 @@ void if (GetShutdownState()) { if (g_bJumpZoom) - g_pRIOMain->SetLampState (16, LAMP_OFF);// úè + g_pRIOMain->SetLampState (16, LAMP_OFF);// hyun g_pRIOMain->SetLampState (50, LAMP_OFF); - g_pRIOMain->SetLampState (33, LAMP_OFF);// úè - g_pRIOMain->SetLampState (34, LAMP_OFF);// úè + g_pRIOMain->SetLampState (33, LAMP_OFF);// hyun + g_pRIOMain->SetLampState (34, LAMP_OFF);// hyun return; } @@ -8797,7 +8797,7 @@ void { if (GetJumpJetState() > 0) { if (g_bJumpZoom) - g_pRIOMain->SetLampState (16, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (16, LAMP_BRIGHT);// hyun g_pRIOMain->SetLampState (33, LAMP_BRIGHT); g_pRIOMain->SetLampState (34, LAMP_BRIGHT); } @@ -8811,10 +8811,10 @@ void if (!GetShutdownState()) if (GetJumpJetState() > 0) { if (g_bJumpZoom) - g_pRIOMain->SetLampState (16, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (16, LAMP_DEFAULT);// hyun g_pRIOMain->SetLampState (50, LAMP_DEFAULT); - g_pRIOMain->SetLampState (33, LAMP_DEFAULT);// úè - g_pRIOMain->SetLampState (34, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (33, LAMP_DEFAULT);// hyun + g_pRIOMain->SetLampState (34, LAMP_DEFAULT);// hyun } } @@ -9284,12 +9284,12 @@ void } if (!GetShutdownState()) - g_pRIOMain->SetLampState (7, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (7, LAMP_BRIGHT);// hyun } else { if (!GetShutdownState()) - g_pRIOMain->SetLampState (7, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (7, LAMP_DEFAULT);// hyun } */ } @@ -9341,7 +9341,7 @@ void if(message->dataContents > 0) { - //úèSetWeaponMode(GroupFireMode); + //hyun SetWeaponMode(GroupFireMode); // selectedWeaponGroup = 1; group1FireRequest ++; // fireRequest ++; @@ -9379,7 +9379,7 @@ void if(message->dataContents > 0) { - //úèSetWeaponMode(GroupFireMode); + //hyun SetWeaponMode(GroupFireMode); // selectedWeaponGroup = 2; group2FireRequest ++; // fireRequest ++; @@ -9415,7 +9415,7 @@ void if(message->dataContents > 0) { - //úèSetWeaponMode(GroupFireMode); + //hyun SetWeaponMode(GroupFireMode); // selectedWeaponGroup = 3; // fireRequest ++; group3FireRequest ++; @@ -9468,7 +9468,7 @@ void if(message->dataContents > 0) { - //úèSetWeaponMode(GroupFireMode); + //hyun SetWeaponMode(GroupFireMode); // selectedWeaponGroup = 4; // fireRequest ++; // group4FireRequest ++; @@ -9508,7 +9508,7 @@ void if(message->dataContents > 0) { - //úèSetWeaponMode(GroupFireMode); + //hyun SetWeaponMode(GroupFireMode); // selectedWeaponGroup = 5; // fireRequest ++; // group5FireRequest ++; @@ -9554,7 +9554,7 @@ void if(message->dataContents > 0) { - //úèSetWeaponMode(GroupFireMode); + //hyun SetWeaponMode(GroupFireMode); //group6FireRequest ++; } else @@ -10344,19 +10344,19 @@ void Verify(message->messageID == ToggleSearchLightMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (27, LAMP_OFF);// úè + g_pRIOMain->SetLampState (27, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { if (g_SearchLight == TRUE) - g_pRIOMain->SetLampState (27, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (27, LAMP_BRIGHT);// hyun QueCommand(VehicleCommand::ToggleSearchLightCommand); } else { if (g_SearchLight == TRUE) - g_pRIOMain->SetLampState (27, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (27, LAMP_DEFAULT);// hyun } } @@ -10546,7 +10546,7 @@ void { //if (!GetShutdownState()) //if (g_bCool == TRUE) { - // g_pRIOMain->SetLampState (19, LAMP_BRIGHT);// úè + // g_pRIOMain->SetLampState (19, LAMP_BRIGHT);// hyun //} isCooling ++; @@ -10560,7 +10560,7 @@ void { //if (!GetShutdownState()) //if (g_bCool == TRUE) { - // g_pRIOMain->SetLampState (19, LAMP_DEFAULT);// úè + // g_pRIOMain->SetLampState (19, LAMP_DEFAULT);// hyun //} isCooling --; @@ -10734,7 +10734,7 @@ void if (GetShutdownState()) { - g_pRIOMain->SetLampState (26, LAMP_OFF);// úè + g_pRIOMain->SetLampState (26, LAMP_OFF);// hyun g_pRIOMain->SetLampState (48, LAMP_OFF); // Light Amp Lamp MFD return; } @@ -10759,7 +10759,7 @@ void MWGUIManager::GetInstance()->ShowLightAmplification(); Mission::GetInstance()->SetLightAmpMissionLights(); ShowZoomIfOn (false); - g_pRIOMain->SetLampState (26, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (26, LAMP_BRIGHT);// hyun if (!g_bJumpZoom) { if (g_pRIOMain->GetLampState (16) == LAMP_BRIGHT) @@ -10773,12 +10773,12 @@ void { if(vehicle->DoesHaveLightAmp()) { - g_pRIOMain->SetLampState (26, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (26, LAMP_DEFAULT);// hyun g_pRIOMain->SetLampState (48, LAMP_DEFAULT); // Light Amp Lamp MFD } else { - g_pRIOMain->SetLampState (26, LAMP_OFF);// úè + g_pRIOMain->SetLampState (26, LAMP_OFF);// hyun g_pRIOMain->SetLampState (48, LAMP_OFF); // Light Amp Lamp MFD } } @@ -10864,12 +10864,12 @@ void Verify(message->messageID == NextNavPointMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (38, LAMP_OFF);// úè + g_pRIOMain->SetLampState (38, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (38, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (38, LAMP_BRIGHT);// hyun m_selectedNavPoint.Remove(); NavPoint *nav_point; if((nav_point = NavPoint::GetNextNavPoint()) != NULL) @@ -10890,7 +10890,7 @@ void } else { - g_pRIOMain->SetLampState (38, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (38, LAMP_DEFAULT);// hyun } } @@ -10915,12 +10915,12 @@ void Verify(message->messageID == PreviousNavPointMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (37, LAMP_OFF);// úè + g_pRIOMain->SetLampState (37, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (37, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (37, LAMP_BRIGHT);// hyun m_selectedNavPoint.Remove(); NavPoint *nav_point; if((nav_point = NavPoint::GetPreviousNavPoint()) != NULL) @@ -10936,7 +10936,7 @@ void } else { - g_pRIOMain->SetLampState (37, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (37, LAMP_DEFAULT);// hyun } } @@ -10961,12 +10961,12 @@ void Verify(message->messageID == NextEnemyMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (10, LAMP_OFF);// úè + g_pRIOMain->SetLampState (10, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (10, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (10, LAMP_BRIGHT);// hyun Entity *next_enemy = NULL; Sensor *sensor = vehicle->GetSensor(); if(sensor) @@ -10978,7 +10978,7 @@ void } else { - g_pRIOMain->SetLampState (10, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (10, LAMP_DEFAULT);// hyun } } @@ -11003,12 +11003,12 @@ void Verify(message->messageID == PreviousEnemyMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (9, LAMP_OFF);// úè + g_pRIOMain->SetLampState (9, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (9, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (9, LAMP_BRIGHT);// hyun Entity *next_enemy = NULL; Sensor *sensor = vehicle->GetSensor(); if(sensor) @@ -11020,7 +11020,7 @@ void } else { - g_pRIOMain->SetLampState (9, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (9, LAMP_DEFAULT);// hyun } } @@ -11045,12 +11045,12 @@ void Verify(message->messageID == NearestEnemyMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (11, LAMP_OFF);// úè + g_pRIOMain->SetLampState (11, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (11, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (11, LAMP_BRIGHT);// hyun m_interfaceTarget.Remove(); m_targetCamera->SetScene(NULL); Entity *entity = NULL; @@ -11065,7 +11065,7 @@ void } else { - g_pRIOMain->SetLampState (11, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (11, LAMP_DEFAULT);// hyun } } @@ -11232,12 +11232,12 @@ void if (GetShutdownState()) { - g_pRIOMain->SetLampState (8, LAMP_OFF);// úè + g_pRIOMain->SetLampState (8, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (8, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (8, LAMP_BRIGHT);// hyun Entity *target_entity; target_entity = targetQueryEntity.GetCurrent(); @@ -11260,7 +11260,7 @@ void } else { - g_pRIOMain->SetLampState (8, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (8, LAMP_DEFAULT);// hyun } } @@ -11285,12 +11285,12 @@ void Verify(message->messageID == NextFriendlyMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (14, LAMP_OFF);// úè + g_pRIOMain->SetLampState (14, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (14, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (14, LAMP_BRIGHT);// hyun Entity *next_friendly = NULL; Sensor *sensor = vehicle->GetSensor(); if(sensor) @@ -11303,7 +11303,7 @@ void } else { - g_pRIOMain->SetLampState (14, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (14, LAMP_DEFAULT);// hyun } } @@ -11328,12 +11328,12 @@ void Verify(message->messageID == PreviousFriendlyMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (13, LAMP_OFF);// úè + g_pRIOMain->SetLampState (13, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (13, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (13, LAMP_BRIGHT);// hyun Entity *next_friendly = NULL; Sensor *sensor = vehicle->GetSensor(); if(sensor) @@ -11346,7 +11346,7 @@ void } else { - g_pRIOMain->SetLampState (13, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (13, LAMP_DEFAULT);// hyun } } @@ -11371,12 +11371,12 @@ void Verify(message->messageID == NearestFriendlyMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (15, LAMP_OFF);// úè + g_pRIOMain->SetLampState (15, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (15, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (15, LAMP_BRIGHT);// hyun Entity *entity = NULL; Sensor *sensor = vehicle->GetSensor(); if(sensor) @@ -11388,7 +11388,7 @@ void } else { - g_pRIOMain->SetLampState (15, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (15, LAMP_DEFAULT);// hyun } } @@ -11478,7 +11478,7 @@ void VehicleInterface::OverrideShutdownMessageHandler(Adept::ReceiverDataMessage if(message->dataContents > 0) { //if (!GetShutdownState()) - // g_pRIOMain->SetLampState (18, LAMP_BRIGHT);// úè + // g_pRIOMain->SetLampState (18, LAMP_BRIGHT);// hyun HeatManager *heat; if (vehicle->IsDerivedFrom (Mech::DefaultData)) { @@ -11492,7 +11492,7 @@ void VehicleInterface::OverrideShutdownMessageHandler(Adept::ReceiverDataMessage } else { //if (!GetShutdownState()) - // g_pRIOMain->SetLampState (18, LAMP_DEFAULT);// úè + // g_pRIOMain->SetLampState (18, LAMP_DEFAULT);// hyun } } //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -11541,7 +11541,7 @@ void VehicleInterface::RightMFDMessageHandler (Adept::ReceiverDataMessageOf if(message->dataContents > 0) { - g_pRIOMain->SetLampState (52, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (52, LAMP_BRIGHT);// hyun if(MWGUIManager::GetInstance()) { Check_Object(MWGUIManager::GetInstance()); @@ -11552,7 +11552,7 @@ void VehicleInterface::RightMFDMessageHandler (Adept::ReceiverDataMessageOf } else { - g_pRIOMain->SetLampState (52, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (52, LAMP_DEFAULT);// hyun } } @@ -11584,12 +11584,12 @@ void VehicleInterface::LeftMFDMessageHandler (Adept::ReceiverDataMessageOf Verify(message->messageID == LeftMFDMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (12, LAMP_OFF);// úè + g_pRIOMain->SetLampState (12, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (12, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (12, LAMP_BRIGHT);// hyun if(MWGUIManager::GetInstance()) { Check_Object(MWGUIManager::GetInstance()); @@ -11610,7 +11610,7 @@ void VehicleInterface::LeftMFDMessageHandler (Adept::ReceiverDataMessageOf } else { - g_pRIOMain->SetLampState (12, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (12, LAMP_DEFAULT);// hyun } } //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -11632,12 +11632,12 @@ void VehicleInterface::ToggleRadarPassiveMessageHandler (Adept::ReceiverDataMess Verify(message->messageID == ToggleRadarPassiveMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (25, LAMP_OFF);// úè + g_pRIOMain->SetLampState (25, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (25, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (25, LAMP_BRIGHT);// hyun if(!vehicle->vehicleShutDown) { if(MWGUIManager::GetInstance()) @@ -11676,7 +11676,7 @@ void VehicleInterface::ToggleRadarPassiveMessageHandler (Adept::ReceiverDataMess } else { - g_pRIOMain->SetLampState (25, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (25, LAMP_DEFAULT);// hyun } } @@ -11702,12 +11702,12 @@ void Verify(message->messageID == ToggleRadarRangeMessageID); if (GetShutdownState()) { - g_pRIOMain->SetLampState (24, LAMP_OFF);// úè + g_pRIOMain->SetLampState (24, LAMP_OFF);// hyun return; } if(message->dataContents > 0) { - g_pRIOMain->SetLampState (24, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (24, LAMP_BRIGHT);// hyun if(!vehicle->vehicleShutDown) { if(MWGUIManager::GetInstance()) @@ -11739,7 +11739,7 @@ void } else { - g_pRIOMain->SetLampState (24, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (24, LAMP_DEFAULT);// hyun } } @@ -13533,13 +13533,13 @@ void VehicleInterface::ShowObjectivesMessageHandler(Adept::ReceiverDataMessageOf { if(message->dataContents > 0) { - g_pRIOMain->SetLampState (36, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (36, LAMP_BRIGHT);// hyun g_bObjMode = !g_bObjMode; // ObjectiveRenderer::Instance->ToggleObjective (); } else { - g_pRIOMain->SetLampState (36, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (36, LAMP_DEFAULT);// hyun } } else @@ -13568,12 +13568,12 @@ void VehicleInterface::MuteMessageHandler(Adept::ReceiverDataMessageOf *mes if(message->dataContents > 0) { - g_pRIOMain->SetLampState (55, LAMP_BRIGHT);// úè + g_pRIOMain->SetLampState (55, LAMP_BRIGHT);// hyun g_bMuteMode = !g_bMuteMode; } else { - g_pRIOMain->SetLampState (55, LAMP_DEFAULT);// úè + g_pRIOMain->SetLampState (55, LAMP_DEFAULT);// hyun } } @@ -13689,7 +13689,7 @@ void if (GetShutdownState()) { if (!g_bJumpZoom) - g_pRIOMain->SetLampState (16, LAMP_OFF);// úè + g_pRIOMain->SetLampState (16, LAMP_OFF);// hyun g_pRIOMain->SetLampState (51, LAMP_OFF); return; } @@ -14489,7 +14489,7 @@ void VehicleInterface::ShowZoom (void) Check_Object(m_reticuleCamera); m_reticuleCamera->GetPerspective(near_clip, far_clip, horizontal_fov, height_to_width); //m_reticuleCamera->SetPerspective(near_clip, far_clip, s_zoomFOV[0], height_to_width); - //»óÈÆ + //sanghoon // jcem - begin float fZoom; gosASSERT(g_fZoomFOVA >= g_fZoomFOVB); diff --git a/Gameleap/code/mw4/Code/MW4/ctcl.h b/Gameleap/code/mw4/Code/MW4/ctcl.h index 41515b53..080fbea1 100644 --- a/Gameleap/code/mw4/Code/MW4/ctcl.h +++ b/Gameleap/code/mw4/Code/MW4/ctcl.h @@ -42,7 +42,7 @@ public: const char* m_pcsz; int m_nLauncherConnection; // 0: no connection, +1: connection, -1: connecting - int m_nConnection2; // m_bCameraShip°ª¿¡ µû¶ó °ÔÀÓ È¤Àº Ä«¸Þ¶ó ½±°úÀÇ Á¢¼ÓÀ» ÀǹÌ, 0: no connection, +1: connection, -1: connecting + int m_nConnection2; // Connection to game or camera ship per m_bCameraShip, 0: no connection, +1: connected, -1: connecting int m_nApplType; int m_nApplState; int m_nGameState; diff --git a/Gameleap/code/mw4/Code/MW4/hudchat.cpp b/Gameleap/code/mw4/Code/MW4/hudchat.cpp index 9ebccbd9..8e7de347 100644 --- a/Gameleap/code/mw4/Code/MW4/hudchat.cpp +++ b/Gameleap/code/mw4/Code/MW4/hudchat.cpp @@ -1,5 +1,5 @@ #include "MW4Headers.hpp" -//»óÈÆ ¾Õ +//sanghoon begin #include "MWMission.hpp" #include "VehicleInterface.hpp" #include "Vehicle.hpp" @@ -21,7 +21,7 @@ #include "mech.hpp" #include "mechlabheaders.h" #include "bucket.hpp" -//»óÈÆ µÚ +//sanghoon end #include "hudcomp.hpp" #include "HUDChat.hpp" #include "hudcomm.hpp" @@ -30,7 +30,7 @@ #include "mwapplication.hpp" #include "..\missionlang\resource.h" -//»óÈƯ begin +//sanghoon begin #include #include #include @@ -43,7 +43,7 @@ extern Scalar g_fLastStartTime; extern Adept::ReplicatorID g_LastTarget; -//»óÈƯ end +//sanghoon end extern "C" char* _stdcall CharPrevA(const char* lpszStart, const char* lpszCurrent); #define CharPrev CharPrevA @@ -164,7 +164,7 @@ void HUDChat::Reset (void) // KillData (); comm = Cast_Object (HUDComm *, MWGUIManager::GetInstance ()->Component (MWGUIManager::HUD_COMM)); - //mr_deviceÀÇ ¸Ê µ¥ÀÌŸ¸¦ ·ÎµåÇÑ´Ù. + //Load map data for mr_device. if(hsh_mrdev_initialized){ extern char AssetsDirectory1[MAX_PATH]; const Map__GameModel *model = Map::GetInstance ()->GetGameModel (); @@ -228,12 +228,12 @@ static const float sm1_offset[][2]={ { 0*2, 0*2}, //special2 }; -//number: 0,1,2,3 lancemateÀÇ ¼ø¼­.. -//part: ÇØ´ç lancemate mechÀÇ part -//color:ÇØ´ç partÀÇ color +//number: 0,1,2,3 lancemate order.. +//part: mech part of the lancemate +//color: color for this part void RenderAux1SmallMech(int num,int part,int color) { - //°¢°¢ÀÇ offset¿¡ µû¶ó¼­ ±×¸°´Ù. + //Draw according to each offset. if(sm1_texture[part][2]!=0){ mfd_device.DrawTexture( sm1_offset[part][0]+190+num*160, @@ -598,15 +598,15 @@ void HUDChat::DrawImplementation(void) #endif if(draw_mr){ - //¹Ì¼Ç ¸®ºä ³»¿ëÀ» ±×¸°´Ù. + //Draw mission review content. //_______________________________________________________________________________________________________ // - // Mech»óÅ ¹× ¸Þ½ÃÁö + // Mech status and messages //_______________________________________________________________________________________________________ if(!mr_device.map_loaded){ comm = Cast_Object (HUDComm *, MWGUIManager::GetInstance ()->Component (MWGUIManager::HUD_COMM)); - //mr_deviceÀÇ ¸Ê µ¥ÀÌŸ¸¦ ·ÎµåÇÑ´Ù. + //Load map data for mr_device. extern char AssetsDirectory1[MAX_PATH]; const Map__GameModel *model = Map::GetInstance ()->GetGameModel (); char temp[256]; @@ -629,7 +629,7 @@ void HUDChat::DrawImplementation(void) int mech_count=0; PMechInfo pMechInfos = &g_aMechInfos[0]; { - //ÇöÀç ´Ù¸¥ ¸ÞÅ©µéÀÇ À̸§ /Kill/Death¸¦ ±×¸°´Ù. + //Draw the name/Kill/Death stats of other mechs. mech_count=MWApplication::GetInstance()->GetMechInfos(2, g_aMechInfos, g_TeamOrderOthers); g_TeamOrderCount=mech_count; if (mech_count > 8) // jcem @@ -657,7 +657,7 @@ void HUDChat::DrawImplementation(void) mr_device.pD3DDevice->SetTexture(0,mr_device.pDDSTexture); - //¸ÞÅ©ÀÇ Damage »óŸ¦ ±×¸°´Ù. + //Draw mech Damage status. for (j=0;j<11;j++){ if (j==7 || j==9 || j==10) continue; @@ -669,7 +669,7 @@ void HUDChat::DrawImplementation(void) } } - //¸ÞÅ©ÀÇ Callsign/Score/Kills/Deaths¸¦ ±×¸°´Ù. + //Draw mech Callsign/Score/Kills/Deaths. int nScore = 0, nKills = 0, nDeaths = 0; callsign=pMechInfos->m_pcszName; if (hud) { @@ -695,7 +695,7 @@ void HUDChat::DrawImplementation(void) pMechInfos++; } - //äÆÃÀåÀÇ ³»¿ëÀ» ±×¸°´Ù. + //Draw the contents of the chat window. stlport::list::iterator iter; int cy=300+30;//chat_y for (iter = m_Messages.begin ();iter != m_Messages.end ();iter++){ @@ -733,8 +733,8 @@ void HUDChat::DrawImplementation(void) int i; // Secondary Maps - //¸Ê°ú ¸Ê °æ°è¼±À» ±×¸°´Ù. (°ÔÀÓÁß¿¡ º¯ÇÏÁö ¾ÊÀ¸¹Ç·Î Çѹø¸¸ ±×¸°´Ù.) - //DrawMapBoundary();//´Ù¸¥ ¹öÀü ±¸ÇöÇÒ °Í... + //Draw map and boundary. (Drawn once since it does not change during game.) + //DrawMapBoundary();//Implement alternate version... mr_device.pD3DDevice->SetRenderState(D3DRENDERSTATE_CLIPPING ,TRUE); mr_device.pD3DDevice->SetTexture(0,mr_device.pDDSMapTexture); mr_device.pD3DDevice->SetRenderState( D3DRENDERSTATE_ALPHABLENDENABLE, TRUE ); @@ -748,7 +748,7 @@ void HUDChat::DrawImplementation(void) //MechWarrior4::VehicleInterface* p = MechWarrior4::VehicleInterface::GetInstance(); - //¹Ì¼Ç ¸®ºä¿¡¼­´Â ÇöÀç ¸ÞÅ©°¡ Á߽ɿ¡ Ç¥½ÃµÇ¹Ç·Î ¸ÊÀÌ ½ºÅ©·Ñ µÇ¾î Ç¥½ÃµÈ´Ù. + //In mission review, current mech is shown at center so the map scrolls. float MR_MSF=4.0f;//Mission Review - Map Scale Factor const float ViewSize=300.0f;//Mission Review - Map Size const float ViewLMargin=10; @@ -758,9 +758,9 @@ void HUDChat::DrawImplementation(void) D3DVIEWPORT7 viewport={ViewLMargin,ViewTMargin,ViewSize,ViewSize,0.0f,1.0f}; mr_device.pD3DDevice->SetViewport(&viewport); - ///////////////////// MAP ½ÃÀÛ ////////////////////// + ///////////////////// MAP BEGIN ////////////////////// - //Focus Mech¸¦ ¼³Á¤ÇÏ´Â ·çƾÀ» ³Ö¾î¾ßÇÑ´Ù. + //Need to add routine to set Focus Mech. Scalar multx,multz; @@ -787,10 +787,10 @@ void HUDChat::DrawImplementation(void) mr_device.pD3DDevice->SetTexture(0,mr_device.pDDSTexture); - //¸Ê»ó¿¡ ¸ÞÅ©µéµé ±×¸®±â.ÅؽºÆ® ¸ÕÀú.. + //Draw mechs on map. Text first.. for(i=0,pMechInfos = &g_aMechInfos[0];im_pMech; - //¸ÞÅ©ÀÇ À§Ä¡¸¦ ±¸ÇÒ °Í.. + //TODO: get mech position.. Stuff::Point3D pos; @@ -827,10 +827,10 @@ void HUDChat::DrawImplementation(void) color,callsign,TEXTALIGN_HCENTER|TEXTALIGN_TOP); } - //¾ÆÀÌÄÜ ±×¸®±â. + //Draw icon. for(i=0,pMechInfos = &g_aMechInfos[0];im_pMech; - //¸ÞÅ©ÀÇ À§Ä¡¸¦ ±¸ÇÒ °Í.. + //TODO: get mech position.. Stuff::Point3D pos; @@ -886,7 +886,7 @@ void HUDChat::DrawImplementation(void) mr_device.pD3DDevice->SetViewport(&viewport2); - ///////////////////// MAP ³¡ ////////////////////// + ///////////////////// MAP END ////////////////////// //_______________________________________________________________________________________________________ // @@ -894,7 +894,7 @@ void HUDChat::DrawImplementation(void) //_______________________________________________________________________________________________________ - //¹Ì¼Ç ½Ã°£ ±×¸®±â...hudtimer.cpp¿¡ DrawImplementation¿¡¼­ µû¿Â°ÍÀÓ.. + //Draw mission timer... taken from DrawImplementation in hudtimer.cpp.. MWMission *mwmiss = Cast_Object (MWMission *,Mission::GetInstance ()); Verify (mwmiss); Stuff::Scalar cur_time=mwmiss->GetMissionTime();//-mwmiss->GetMissionTime(); @@ -923,7 +923,7 @@ void HUDChat::DrawImplementation(void) if(g_nTeamOrderMode==TEAM_MODE){ int i,j; int size=3; - //¸ÞÅ©µéÀÇ »óŸ¦ ±×¸°´Ù. + //Draw mech status. PMechInfo pMechInfos = &g_aMechInfos[1]; size=MWApplication::GetInstance()->GetMechInfos(0, g_aMechInfos, g_TeamOrderOthers); size--; @@ -970,7 +970,7 @@ void HUDChat::DrawImplementation(void) pMechInfos++; } mfd_device.DrawMFDBackText(mfd_text_comm1); - //äÆÃÀåÀÇ ³»¿ëÀ» ±×¸°´Ù. + //Draw the contents of the chat window. stlport::list::iterator iter; int cy=240;//chat_y for (iter = m_Messages.begin ();iter != m_Messages.end ();iter++){ @@ -996,7 +996,7 @@ void HUDChat::DrawImplementation(void) } }else if(g_nTeamOrderMode==FREEFORALL_MODE){ - //ÇöÀç ´Ù¸¥ ¸ÞÅ©µéÀÇ À̸§ /Kill/Death¸¦ ±×¸°´Ù. + //Draw the name/Kill/Death stats of other mechs. int size=0; PMechInfo pMechInfos = &g_aMechInfos[1]; size=MWApplication::GetInstance()->GetMechInfos(2, g_aMechInfos, g_TeamOrderOthers); @@ -1006,10 +1006,10 @@ void HUDChat::DrawImplementation(void) size = 7; int i; - //¹øÈ£¸¦ ¸ÕÀú Áö¿î´Ù. + //Clear the numbers first. // MSL 5.03 Comm MFD for(i=0;i<7;i++)mfd_text_comm3[i][0]=0; - //¹øÈ£¸¦ ä¿ö ³Ö´Â´Ù. + //Fill in the numbers. // MSL 5.03 Comm MFD for(i=0;ix,(float)p2->y,0xFFFFFFFF,callsign,TEXTALIGN_ORG); }else{ - //ÃÖ¼ÒÅ©±â ÆùÆ®µµ.. ³Ñ¾î¼±´Ù... - //2lineÀ¸·Î ¸¸µç´Ù. + //Even the minimum font size is exceeded... + //Split into 2 lines. char callsign2[128]; strcpy(callsign2,callsign); int len2=strlen(callsign)/2; @@ -1120,7 +1120,7 @@ void HUDChat::DrawImplementation(void) pMechInfos++; } - //äÆÃÀåÀÇ ³»¿ëÀ» ±×¸°´Ù. + //Draw the contents of the chat window. stlport::list::iterator iter; int cy=180;//chat_y for (iter = m_Messages.begin ();iter != m_Messages.end ();iter++){ @@ -1145,7 +1145,7 @@ void HUDChat::DrawImplementation(void) iter = m_Messages.erase (iter); } /* - //MWMission.cpp¿¡¼­ °¡Á®¿Â°ÍÀÎ + //Taken from MWMission.cpp MWMission *mwmiss = Cast_Object (MWMission *,Mission::GetInstance ()); int death=0,kill=0;//,score @@ -1167,7 +1167,7 @@ void HUDChat::DrawImplementation(void) }else if(g_nTeamOrderMode==TEAM_MESSAGE2){ ;//do nothing } - //»óÈÆ µÚ + //sanghoon end mfd_device.EndChannel(); } else { }//hsh_initialized diff --git a/Gameleap/code/mw4/Code/MW4/hudcomm.cpp b/Gameleap/code/mw4/Code/MW4/hudcomm.cpp index 21c8b6b2..042ddf47 100644 --- a/Gameleap/code/mw4/Code/MW4/hudcomm.cpp +++ b/Gameleap/code/mw4/Code/MW4/hudcomm.cpp @@ -1,5 +1,5 @@ #include "MW4Headers.hpp" -//»óÈÆ ¾Õ +//sanghoon begin #include "MWMission.hpp" #include "VehicleInterface.hpp" #include "Narc.hpp" @@ -13,7 +13,7 @@ #include "mwguimanager.hpp" #include "MWPlayer.hpp" #include -//»óÈÆ µÚ +//sanghoon end #include "hudcomp.hpp" #include "HUDComm.hpp" @@ -25,14 +25,14 @@ #include "..\missionlang\resource.h" #include "mechlabheaders.h" -//»óÈƯ begin +//sanghoon begin #include #include #include #include -//»óÈƯ end +//sanghoon end using namespace MechWarrior4; diff --git a/Gameleap/code/mw4/Code/MW4/hudcomp.hpp b/Gameleap/code/mw4/Code/MW4/hudcomp.hpp index 0eac845d..fe3d61bb 100644 --- a/Gameleap/code/mw4/Code/MW4/hudcomp.hpp +++ b/Gameleap/code/mw4/Code/MW4/hudcomp.hpp @@ -333,7 +333,7 @@ inline DWORD DarkerColor (DWORD color) { m_Justification = value; } void Wrap (bool value) { m_Wrap = value; } - //»óÈÆ + //sanghoon void SetAsAlt(){ m_Font=altFontHandle; } @@ -381,9 +381,9 @@ inline DWORD DarkerColor (DWORD color) virtual void EndPos (DWORD& x,DWORD& y, bool bAdjust = true); bool Empty (void) { return (m_Text[0] == 0); } - //»óÈÆ ¾Õ + //sanghoon begin char *hsh_get_m_Text(){return m_Text;} - //»óÈÆ µÚ + //sanghoon end }; class HUDNumberText : public HUDText diff --git a/Gameleap/code/mw4/Code/MW4/hudcomp2.cpp b/Gameleap/code/mw4/Code/MW4/hudcomp2.cpp index 4ed49289..9a6a7222 100644 --- a/Gameleap/code/mw4/Code/MW4/hudcomp2.cpp +++ b/Gameleap/code/mw4/Code/MW4/hudcomp2.cpp @@ -95,7 +95,7 @@ void HUDTargetArrow::SetZoomWindow(Stuff::Scalar left,Stuff::Scalar top,Stuff::S void HUDTargetArrow::DrawImplementation(void) { - //»óÈÆ-±ô¹ÚÀÓ Ã³¸®´Â ¾îµð¼­ ÇÏ´ÂÁö ã¾Æ º¼°Í. + //sanghoon - need to find where blink handling is done. Point3D loc,size; DWORD color; int textx,texty,ty2; @@ -208,7 +208,7 @@ void HUDTargetArrow::DrawImplementation(void) { size = m_Textures[5]->Size (); m_Textures[5]->Draw (Point3D (m_TargetX,m_TargetY,0.9f),size,color); - //²©¼è ³×°³°¡ Çϳª·Î ÇÕÃÄÁø ÅؽºÃÄ... + //Texture of four angle brackets merged into one... } else { @@ -278,7 +278,7 @@ void HUDTorsoBar::DrawImplementation(void) Scalar currentxval,currentyval; Point3D size,loc,texsize; - //xÃàÀ» ³ªÅ¸³»´Â ±×·¡ÇÁ¸¦ ±×¸®´Â ·çƾ... + //Routine to draw the graph representing the x-axis... //_________________________________________________________________________ size = TwistSize (); texsize = m_Textures[0]->Size (); @@ -289,7 +289,7 @@ void HUDTorsoBar::DrawImplementation(void) if (currentxval > 0) loc.x += 1.0f; DWORD color = DarkerColor (Color ()); - //°¡·Î ruler¸¦ ±×¸°´Ù.(È­»ìÇ¥´Â µé¾îÀÖÁö ¾ÊÀ½) + //Draw horizontal ruler. (arrows not included) m_Textures[5]->Draw (loc,m_Textures[5]->Size (),color,HUDTexture::NO_FLIP,true); color = Color (); if (currentxval != 0) @@ -315,19 +315,19 @@ void HUDTorsoBar::DrawImplementation(void) ty= (DWORD) (loc.y+size.y+10); if ((currentxval > 5) || (currentxval < -5)) { - //°úµµÇÑ twist½Ã¿¡ ¹æÇâÇ¥½ÃÇØÁÜ.. + //Shows direction indicator when torso twist is excessive.. m_TwistText->Draw (Point3D ((Scalar) tx,(Scalar) ty,0.9f)); } - //»óüǥ½Ã »ç°¢Çü.. + //Upper body indicator rectangle.. // Changed Torso Bar from Green to Yellow // MSL 5.00 color = MakeColor (255,255,0,250); my_DrawRect (min,(int) loc.y,max,(int) (loc.y+size.y),color); color = DarkerColor (Color ()); - //À§ÂÊ, »óü ¹æÇâÇ¥½Ã È­»ìÇ¥.. + //Top arrow indicating upper body direction.. m_Textures[2]->Draw (Point3D (loc.x-currentxval,loc.y-1,0.9f),texsize,color); - //¾Æ·¡ÂÊ. Áß½ÉÇ¥½Ã È­»ìÇ¥.. + //Bottom arrow indicating center position.. m_Textures[3]->Draw (Point3D (loc.x-1,loc.y+size.y+1,0.9f),texsize,color); // DrawLine ((int) (loc.x-currentxval),(int) (loc.y-1),(int) (loc.x-currentxval),(int) (loc.y+size.y),color); } @@ -339,7 +339,7 @@ void HUDTorsoBar::DrawImplementation(void) // DrawLine ((int) (loc.x),(int) (loc.y-1),(int) (loc.x),(int) (loc.y+size.y),color); } - //yÃàÀ» ³ªÅ¸³»´Â ±×·¡ÇÁ¸¦ ±×¸®´Â ·çƾ...<==¿©±â´Â °úµµÇÑ »óÇϸ¦ ³ªÅ¸³»´Â ÅؽºÆ®°¡ ¾ø´Ù. + //Routine to draw graph for y-axis... <== no excessive up/down text here. //_________________________________________________________________________ size = PitchSize (); currentyval = (m_TorsoPitch*size.y)/100.0f; // 33 is the width of the bar @@ -382,7 +382,7 @@ void HUDTorsoBar::DrawImplementation(void) m_Textures[1]->Draw (Point3D (loc.x+size.x,loc.y,0.9f),texsize,color); // DrawLine ((int) (loc.x-1),(int) (loc.y),(int) (loc.x+size.x+2),(int) (loc.y),color); } - //³¡.. DrawImplementation. + //End.. DrawImplementation. } diff --git a/Gameleap/code/mw4/Code/MW4/huddamage.cpp b/Gameleap/code/mw4/Code/MW4/huddamage.cpp index df17834e..03cf9f7d 100644 --- a/Gameleap/code/mw4/Code/MW4/huddamage.cpp +++ b/Gameleap/code/mw4/Code/MW4/huddamage.cpp @@ -9,7 +9,7 @@ #include "mwapplication.hpp" #include "..\missionlang\resource.h" -//»óÈƯ begin +//sanghoon begin #include #include #include @@ -34,7 +34,7 @@ bool g_bNextTargetMode = false; bool g_bCrossTargetMode = false; // MSL 5.03 Secondary Damage Display int g_nAuxilMode = 0; -//»óÈƯ end +//sanghoon end using namespace MechWarrior4; namespace HUDDAMAGE @@ -330,9 +330,9 @@ HUDDamage::HUDDamage() Color (MakeColor (0,175,0,150)); m_DamageFlashTime = 0; m_HitFlashTime = 0; - //»óÈÆ ¾Õ + //sanghoon begin VehicleInterface::GetInstance()->hudDamageMode=false; - //»óÈÆ µÚ + //sanghoon end m_ArmorMode = VehicleInterface::GetInstance()->hudDamageMode; for (i=0;iDraw (Point3D ((Scalar) bartable[i]+1.0f,(Scalar) y,0.9f),size,MakeColor (255,255,255,255),HUDTexture::NO_FLIP,true); if (!(m_HitFlashCount[trans_array[i]] & 0x01)) { @@ -752,7 +752,7 @@ void HUDDamage::DrawImplementation(void) fred = 0; for (i=0;i<11;i++) - {//13À̶ó´Â ¼ýÀÚ°¡ ÀǹÌÇÏ´Â °ÍÀº ¹«¾ùÀϱî? + {//What does the number 13 mean here? #if 0 if (i != fred) { @@ -872,7 +872,7 @@ void HUDDamage::DrawImplementation(void) mfd_device.pD3DDevice->SetRenderState( D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA ); mfd_device.pD3DDevice->SetRenderState( D3DRENDERSTATE_DESTBLEND, D3DBLEND_INVSRCALPHA ); - //¿ø·¡°ÍÀº..13,14,14,14,14,14,14,14,16,14ÀÇ °£°ÝÀ» µÎ°í ÀÖ´Ù. + //The original spacing is 13,14,14,14,14,14,14,14,16,14. const hsh_bartable[11] = {26+61*0,26+61*1,26+61*2,26+61*3,26+61*4,26+61*5,26+61*6,26+61*7,522,591,540}; DWORD color=0xFFFFFFFF; @@ -907,7 +907,7 @@ void HUDDamage::DrawImplementation(void) radar_device.pDDSTarget->Blt(&rc,NULL,NULL,DDBLT_COLORFILL ,&fx); for (i=0;i<11;i++) - {//13À̶ó´Â ¼ýÀÚ°¡ ÀǹÌÇÏ´Â °ÍÀº ¹«¾ùÀϱî? + {//What does the number 13 mean here? int dv=m_DamageValues[i]; DWORD color=0xFF000000; if(0<=dv && dv<=5) @@ -948,7 +948,7 @@ void HUDDamage::DrawImplementation(void) { if (m_ArmorValues[trans_array[i]] != -1) { - hsh_x=hsh_bartable[i];//7¿¡¼­´Â ¿¹¿ÜÀÌ´Ù. + hsh_x=hsh_bartable[i];//Exception at index 7. int tr=trans_array[i]; DWORD color=(m_HitFlashCount[tr] & 0x01)? 0xFFFFFFFF : SH_DamageColor[m_DamageValues[tr]]; @@ -999,7 +999,7 @@ void HUDDamage::DrawImplementation(void) mfd_device.LoadDamageTexture(texturename[m_MechID]); for (i=0;i<13;i++) - {//13À̶ó´Â ¼ýÀÚ°¡ ÀǹÌÇÏ´Â °ÍÀº ¹«¾ùÀϱî? + {//What does the number 13 mean here? int dv=m_DamageValues[i]; DWORD color=0xFF000000; if(0<=dv && dv<=5)color=SH_DamageColor[dv]; @@ -1249,7 +1249,7 @@ HUDTargetDamage::HUDTargetDamage() : m_TargetName->Justification (HUDText::LEFT_ALIGN); m_TargetRangeText = new HUDNumberText (); m_TargetRangeText->Justification (HUDText::LEFT_ALIGN); - //»óÈÆ + //sanghoon // m_TargetRangeText->SetSize(HUDText::LARGE_SIZE); m_TargetRangeText->SetSize(HUDText::MEDIUM_SIZE); m_TargetAlignment = 0; @@ -1269,9 +1269,9 @@ HUDTargetDamage::HUDTargetDamage() : m_TargetMechID = 0; m_Weapons.clear (); - //»óÈÆ ¾Õ + //sanghoon begin VehicleInterface::GetInstance()->hudTargetDamageMode=false; - //»óÈÆ µÚ + //sanghoon end m_ArmorMode = VehicleInterface::GetInstance()->hudTargetDamageMode; m_LastMechMode = false; } @@ -1315,7 +1315,7 @@ void HUDTargetDamage::Reset (void) } else { - //»óÈÆ + //sanghoon mfd_device.LoadTargetTexture(texturename[m_TargetMechID]); } @@ -1764,7 +1764,7 @@ if(!hsh_initialized){ if (m_TargetTonnage == -1) { - //ŸÄÏÀÌ ¸ÞÅ©°¡ ¾Æ´Ò¶§.. + //When target is not a mech.. Verify (!m_ArmorMode); // only mechs show armor mode if (m_TargetVehicle.GetCurrent()->IsDerivedFrom (MWObject::DefaultData)) { @@ -1805,7 +1805,7 @@ if(!hsh_initialized){ } else { - //ŸÄÏÀÌ ¸ÞÅ©À϶§.. + //When target is a mech.. Verify (m_TargetVehicle.GetCurrent ()->IsDerivedFrom (Mech::DefaultData)); Mech *mech = Cast_Object(Mech *, m_TargetVehicle.GetCurrent()); Check_Object (mech); @@ -1826,7 +1826,7 @@ if(!hsh_initialized){ if (m_ArmorMode) { - //ŸÄÏÀÌ ¸ÞÅ©ÀÌ°í ¾Æ¸Ó ¸ðµåÀ϶§ + //When target is a mech and in armor mode int x,y; size = m_Textures[20]->Size (); @@ -1897,7 +1897,7 @@ if(!hsh_initialized){ } else { - //»óÈÆ + //sanghoon mfd_device.LoadTargetTexture(texturename[m_TargetMechID]); } @@ -1910,7 +1910,7 @@ if(!hsh_initialized){ fred = 0; for (i=0;i<11;i++) - {//13À̶ó´Â ¼ýÀÚ°¡ ÀǹÌÇÏ´Â °ÍÀº ¹«¾ùÀϱî? + {//What does the number 13 mean here? #if 0 if (i != fred) { @@ -1983,7 +1983,7 @@ else if (m_TargetVehicle.GetCurrent ()) { - //3D target ¶Ç´Â 2D TargetÀ» ±×¸°´Ù. + //Draw 3D target or 2D target. if (!m_ArmorMode) { if(g_f3dtarget) @@ -2006,19 +2006,19 @@ else int mechindex=GetMechIndex(model->mechID); if(mechindex>=0) { - //Áö¿øµÇ´Â mech¸¸ ±×¸°´Ù. + //Draw only supported mechs. // MSL 5.02 Target MFD Image int x=(mechindex%8)*128; int y=(mechindex/8)*128; // int x=(mechindex%4)*128; // int y=(mechindex/4)*128; - //TargetÀ» 2D·Î ±×¸°´Ù. + //Draw target in 2D. mfd_device.pD3DDevice->SetTexture(0,mfd_device.pDDSMechTexture); mfd_device.pD3DDevice->SetRenderState( D3DRENDERSTATE_ALPHABLENDENABLE, FALSE); mfd_device.pD3DDevice->SetTextureStageState(0,D3DTSS_MAGFILTER,D3DTFG_LINEAR); mfd_device.pD3DDevice->SetTextureStageState(0,D3DTSS_MINFILTER,D3DTFG_LINEAR); - //¸ÞÅ©ÀÇ Á¾·ùº°·Î ÁÂÇ¥¸¦ °è»êÇÏ´Â.. ·çƾÀ» ÀÛ¼ºÇÏ¿© Áý¾î ³ÖÀ»°Í... + //Need to write routine to calculate coordinates per mech type... // MSL 5.02 Target MFD Image mfd_device.tw=1024,mfd_device.th=1024; // MSL 5.02 Target MFD Image Resize @@ -2060,7 +2060,7 @@ else radar_device.pDDSTarget->Blt(&rc,NULL,NULL,DDBLT_COLORFILL ,&fx); for (int i=0;i<11;i++) - {//13À̶ó´Â ¼ýÀÚ°¡ ÀǹÌÇÏ´Â °ÍÀº ¹«¾ùÀϱî? + {//What does the number 13 mean here? int dv=m_DamageValues[i]; DWORD color=0xFF000000; if(0<=dv && dv<=5) @@ -2103,7 +2103,7 @@ else if (m_ShowData) { - //ÁÂÃø ÇÏ´ÜÀÇ targetÀÇ ¹«±âÀÇ »óŸ¦ Ç¥½ÃÇÏ´Â ·çƾ.. + //Routine to display weapon status of target in lower-left.. if (!m_ArmorMode) { stlport::vector::iterator iter; @@ -2134,7 +2134,7 @@ else if (m_TargetTonnage == -1) { - //ŸÄÏÀÌ ¸ÞÅ©°¡ ¾Æ´Ò¶§.. + //When target is not a mech.. Verify (!m_ArmorMode); // only mechs show armor mode if (m_TargetVehicle.GetCurrent()->IsDerivedFrom (MWObject::DefaultData)) { @@ -2145,7 +2145,7 @@ else m_ArmorValues[0] = (veh->m_HitPoints / veh->m_MaxHitPoints); if (m_ArmorValues[0] != -1) { - //µ¥¹ÌÁö ¸·´ë ±×·¡ÇÁ¸¦ ±×¸°´Ù. ³ôÀÌ¿Í »ö»ó µ¿½Ã¿¡ Ç¥ÇöµÈ´Ù. + //Draw damage bar graph. Height and color are expressed simultaneously. int level; level = (int) ((m_ArmorValues[0]*(MAX_HUD_DAMAGE_LEVEL))+0.5f); level = MAX_HUD_DAMAGE_LEVEL - level; @@ -2160,7 +2160,7 @@ else }//When the target is not a mech. else { - //ŸÄÏÀÌ ¸ÞÅ©À϶§.. + //When target is a mech.. Verify (m_TargetVehicle.GetCurrent ()->IsDerivedFrom (Mech::DefaultData)); Mech *mech = Cast_Object(Mech *, m_TargetVehicle.GetCurrent()); Check_Object (mech); @@ -2178,7 +2178,7 @@ else if (m_ArmorMode) { - //ŸÄÏÀÌ ¸ÞÅ©ÀÌ°í ¾Æ¸Ó ¸ðµåÀ϶§ + //When target is a mech and in armor mode for (i=0;iUpdateText (name); - //»óÈÆ ¾Õ + //sanghoon begin strncpy(hsh_targetname,name,sizeof(hsh_targetname)); hsh_targetname[sizeof(hsh_targetname)-1]=0; - //»óÈÆ µÚ + //sanghoon end } void TargetRange (Stuff::Scalar value) { @@ -108,10 +108,10 @@ namespace MechWarrior4 int temp = (int) value; sprintf (text,"%dm",temp); m_TargetRangeText->UpdateText (text); - //»óÈÆ ¾Õ + //sanghoon begin strncpy(hsh_targetrange,text,sizeof(hsh_targetrange)); hsh_targetrange[sizeof(hsh_targetrange)-1]=0; - //»óÈÆ µÚ + //sanghoon end } void TargetTonnage (Stuff::Scalar value); void TargetAlignment (int value) diff --git a/Gameleap/code/mw4/Code/MW4/hudmap.cpp b/Gameleap/code/mw4/Code/MW4/hudmap.cpp index 9a15f42b..b8eb0796 100644 --- a/Gameleap/code/mw4/Code/MW4/hudmap.cpp +++ b/Gameleap/code/mw4/Code/MW4/hudmap.cpp @@ -8,14 +8,14 @@ #include "mwapplication.hpp" // MSL 5.02 Nav Points #include "navpoint.hpp" -//»óÈƯ begin +//sanghoon begin #include #include #include #include extern char AssetsDirectory1[MAX_PATH]; -//»óÈƯ end +//sanghoon end const Stuff::Time SHOT_TIME = 2.0; @@ -37,7 +37,7 @@ HUDMap::HUDMap(): AddTexture ("hud\\map",0,28,28,228,228); else{ AddTexture (model->m_HudMap,0,0,0,255,255); - //»óÈÆ ¾Õ + //sanghoon begin radar_device.MapDrawn=false; /* if(hsh_initialized){ @@ -49,7 +49,7 @@ HUDMap::HUDMap(): radar_device.MapDrawn=true; } */ - //»óÈÆ µÚ + //sanghoon end } Location (Point3D (301,399,0.9f)); @@ -154,7 +154,7 @@ void HUDMap::DrawImplementation(void) Point3D loc,size; int i; - //¸ÊÀ» ±×¸°´Ù. + //Draw the map. Vehicle *vehicle = m_Vehicle.GetCurrent(); loc = Location (); @@ -163,7 +163,7 @@ void HUDMap::DrawImplementation(void) // loc.y -= (size.y/2.0f); m_Textures[0]->Draw (loc,size,MakeColor (255,255,255,255),HUDTexture::NO_FLIP,true); - //Torso Sweep(ÆÄÀ̸ð¾ç ½Ã¾ß°¢ Ç¥½ÃµµÇü)À» Ç¥½ÃÇÑ´Ù. + //Display Torso Sweep (pie-shaped field-of-view indicator). if (NULL == vehicle) return; @@ -214,7 +214,7 @@ void HUDMap::DrawImplementation(void) //Draw Radar Blips - //·¹ÀÌ´ÙÀÇ ¿ÀºêÁ§Æ®µéÀ» Ç¥½ÃÇÑ´Ù. + //Display radar objects. MWObject *current_object; for(i=0;iGetSensor()->numberOfContacts;i++) @@ -332,7 +332,7 @@ void HUDMap::DrawImplementation(void) color = MakeColor (255,255,255,250); m_Textures[id+20]->Draw (Point3D (object_display_pos.x,object_display_pos.y,0.9f),size,color,HUDTexture::NO_FLIP,true); } - //ÀÛÀü ¹üÀ§(Boundary) Ç¥½Ã ´Ù°¢Çü(ÁÖȲ»¡°­) + //Operation boundary display polygon (orange-red) size = Size (); loc = Location (); Mission *miss; diff --git a/Gameleap/code/mw4/Code/MW4/hudmap.hpp b/Gameleap/code/mw4/Code/MW4/hudmap.hpp index 5478a07e..cf9b3acd 100644 --- a/Gameleap/code/mw4/Code/MW4/hudmap.hpp +++ b/Gameleap/code/mw4/Code/MW4/hudmap.hpp @@ -34,9 +34,9 @@ namespace MechWarrior4 void DrawImplementation(void); void ConvertMapCoords (float& x,float& y); void ConvertMapCoords (Point3D& pt); - //»óÈÆ ¾Õ + //sanghoon begin bool hsh_fdraw; - //»óÈÆ µÚ + //sanghoon end public: HUDMap(); diff --git a/Gameleap/code/mw4/Code/MW4/hudscore.cpp b/Gameleap/code/mw4/Code/MW4/hudscore.cpp index ae8ba1ec..ad006e7f 100644 --- a/Gameleap/code/mw4/Code/MW4/hudscore.cpp +++ b/Gameleap/code/mw4/Code/MW4/hudscore.cpp @@ -90,7 +90,7 @@ get_score: HUDScore::HUDScore() { m_AnimTime = 0; - //»óÈÆ + //sanghoon Location (Point3D (0,0,0.9f)); // Location (Point3D (200,100,0.9f)); Size (Point3D (310,300,0.9f)); @@ -128,7 +128,7 @@ HUDScore::HUDScore() m_PingHeader = new HUDText (); m_PingHeader ->SetAsAlt(); - //»óÈÆ + //sanghoon /* m_PingHeader->Justification (HUDText::LEFT_ALIGN); m_PingHeader->UpdateText (app->GetLocString (IDS_PINGHEADER)); @@ -444,7 +444,7 @@ void HUDScore::DrawImplementation(void) m_TimeLeftText->UpdateText (text); } - //»óÈÆ + //sanghoon count+=1; loc = Location (); loc.y=600-count*LINE_HEIGHT; @@ -455,7 +455,7 @@ void HUDScore::DrawImplementation(void) DWORD bcolor = BrighterColor (Color ()); - //»óÈÆ.. + //sanghoon { Stuff::Point3D loc2(800-size.x,600-LINE_HEIGHT-1,0.9f); LDrawRect (loc2,0,0,size.x,LINE_HEIGHT,MakeColor (0,150,0,128)); @@ -481,7 +481,7 @@ void HUDScore::DrawImplementation(void) m_PlayerTitle->Draw (Point3D (loc.x+10,yvalue,0.9f)); DWORD h; - //»óÈÆ + //sanghoon //m_PingHeader->DrawSize (pingwidth,h); //pingx = loc.x + size.x - pingwidth - 10; pingx = loc.x + size.x ; diff --git a/Gameleap/code/mw4/Code/MW4/hudtarg.cpp b/Gameleap/code/mw4/Code/MW4/hudtarg.cpp index a7e42232..8de479c1 100644 --- a/Gameleap/code/mw4/Code/MW4/hudtarg.cpp +++ b/Gameleap/code/mw4/Code/MW4/hudtarg.cpp @@ -367,10 +367,10 @@ void HUDReticle::DrawImplementation(void) m_Textures[36]->Draw (loc,size,m_LeftCenterColor); m_Textures[37]->Draw (loc,size,m_RightCenterColor); - for (i=0;i<3;i++)//»óÈÆ ¿ø·¡ 6À̾úÀ½ + for (i=0;i<3;i++)//sanghoon: originally 6 { size = m_Textures[20+i]->Size (); - //CanHit´Â Hudweapon¿¡¼­ setÇÑ´Ù... + //CanHit is set in Hudweapon... if (m_Weapons->CanHit (i)) color = MakeColor (0,255,0,255); else { diff --git a/Gameleap/code/mw4/Code/MW4/hudweapon.cpp b/Gameleap/code/mw4/Code/MW4/hudweapon.cpp index 6b97fa54..1d430a37 100644 --- a/Gameleap/code/mw4/Code/MW4/hudweapon.cpp +++ b/Gameleap/code/mw4/Code/MW4/hudweapon.cpp @@ -15,14 +15,14 @@ static float RECOVER_FROM_JAMMING_TIME = 5.0f; // MSL 5.03 Ammo Bay Fire static float TIME_AMMO_BAY_FIRE = 7.0f; -//»óÈƯ begin +//sanghoon begin #include #include #include #include extern bool g_bNoWeaponRangeCheck; -//»óÈƯ end +//sanghoon end static void MakeStringCaps(char* buffer) { @@ -555,7 +555,7 @@ if(mfd_device.BeginChannel(4)) int rh=25;//row_height - //16°³ÀÇ row¸¦ °¡Áú¼ö Àִ°ÍÀ¸·Î °¡Á¤ÇÑ´Ù.(rowÆ÷ÇÔ) + //Assumes up to 16 rows (including header row). // background boxes mfd_device.DrawQuad(0+lm,0+tm,96+lm,(totalcount+1)*rh+10+tm,0xFF404040); @@ -609,13 +609,13 @@ if(mfd_device.BeginChannel(4)) DWORD hsh_color1=0,hsh_color2=0; - //¹«±â ¹ß»ç°¡´É »óÅÂ: °¢°¢ÀÇ »ö»ó¿¡ ´ëÇØ Á¤È®È÷ Á¤ÀÇ ÇÒ°Í. + //Weapon fire-ready status: define exact color for each state. - //Á¤»ó(Ÿ°Ù¾È¿¡ ÀÖÀ½)(¹ß»ç°¡´É) 0xFFFFFFFF - //Á¤»ó(Ÿ°Ù¹Û¿¡ ÀÖÀ½)(¹ß»ç°¡´É) 0xFFFFFFFF - //·ÎµùÁß(¹ß»ç ºÒ°¡) 0xFFA0A0A0 - //ź¾ËÀÌ ¶³¾îÁü(¹ß»çºÒ°¡) 0xFF808080 - //°íÀå³²(¹ß»çºÒ°¡) 0xFF606060 + //Normal (target in range)(can fire) 0xFFFFFFFF + //Normal (target out of range)(can fire) 0xFFFFFFFF + //Reloading (cannot fire) 0xFFA0A0A0 + //Out of ammo (cannot fire) 0xFF808080 + //Destroyed (cannot fire) 0xFF606060 DWORD nameheight=30; int top=5+(weapony+1)*rh; int bottom = top+rh; @@ -694,7 +694,7 @@ if(mfd_device.BeginChannel(4)) char *weapon_string[3]={"1","2","3"}; - //ÇØ´ç ¹«±âÀÇ ±×·ìÀÇ »óŸ¦ Ç¥½ÃÇÑ´Ù. + //Display the status of the weapon group. for(int i=0;i<3;i++){ DWORD weapon_color=weapon_flag[i]?normal_color:nogroup_color; // MSL 5.00 Added Ammocount check, if = 0 then weapon name same as ammo nogroup_color @@ -707,7 +707,7 @@ if(mfd_device.BeginChannel(4)) Point3D numsize = m_Textures[20]->Size (); - //¹«±â À̸§À» Ç¥½ÃÇÑ´Ù. + //Display weapon name. // MSL 5.00 Added Ammocount check, if = 0 then weapon name same as ammo out_color switch (weapon->m_status) { @@ -786,7 +786,7 @@ if(mfd_device.BeginChannel(4)) } } - //ÇöÀç ¿£ÅÍÅ°·Î ¹ß»çµÇ´Â ¼±ÅÃµÈ ¹«±â¿¡ ´ëÇؼ­ ÇÁ·¹ÀÓÀ» Ç¥½ÃÇÑ´Ù. + //Display frame for the selected weapon currently fired with Enter. if (weapon->m_weapon == m_SingleFire.GetCurrent ()){ mfd_device.DrawFrame(155+lm,top+1+tm,545+lm,bottom-1+tm,0xFFFFFFFF); } @@ -795,7 +795,7 @@ if(mfd_device.BeginChannel(4)) if ((ammocount > -1) && (weapon->m_status != 2)){ mfd_device.pFont[0].DrawText(615-5+lm,center+tm,ammocount_color,text,TEXTALIGN_VCENTER|TEXTALIGN_RIGHT); }else if (ammocount == -1){ - //¹«±â¼ö°¡ Á¦ÇÑÀÌ ¾ø´Â ¹«±âÀÇ Á¾·ù¿¡´Â '-'¸¦ Ç¥½ÃÇÑ´Ù. + //Display '-' for weapon types with unlimited ammo. mfd_device.pFont[0].DrawText(615-5+lm,center+tm,ammocount_color,"-",TEXTALIGN_VCENTER|TEXTALIGN_RIGHT); } weapony ++; diff --git a/Gameleap/code/mw4/Code/MW4/recscore.cpp b/Gameleap/code/mw4/Code/MW4/recscore.cpp index 29a29de6..1518080f 100644 --- a/Gameleap/code/mw4/Code/MW4/recscore.cpp +++ b/Gameleap/code/mw4/Code/MW4/recscore.cpp @@ -1008,27 +1008,27 @@ const char* ArmorZoneStr(int nArmorZone) case Adept::DamageObject::NullArmorZone: return "()"; case Adept::DamageObject::LeftLegArmorZone: - return "¿Þ¹ß"; + return "Left Leg"; case Adept::DamageObject::RightLegArmorZone: - return "¿À¸¥¹ß"; + return "Right Leg"; case Adept::DamageObject::LeftArmArmorZone: - return "¿ÞÆÈ"; + return "Left Arm"; case Adept::DamageObject::RightArmArmorZone: - return "¿À¸¥ÆÈ"; + return "Right Arm"; case Adept::DamageObject::RightTorsoArmorZone: - return "¿ìÃø"; + return "Right Torso"; case Adept::DamageObject::LeftTorsoArmorZone: - return "ÁÂÃø"; + return "Left Torso"; case Adept::DamageObject::CenterTorsoArmorZone: - return "Àü¸é"; + return "Front"; case Adept::DamageObject::CenterRearTorsoArmorZone: - return "Èĸé"; + return "Rear"; case Adept::DamageObject::HeadArmorZone: - return "¸Ó¸®"; + return "Head"; case Adept::DamageObject::SpecialArmorZone1: - return "º¸Á¶ÀåÄ¡1"; + return "Aux Device 1"; case Adept::DamageObject::SpecialArmorZone2: - return "º¸Á¶ÀåÄ¡2"; + return "Aux Device 2"; case Adept::DamageObject::DefaultArmorZone: return "Default"; } @@ -1990,83 +1990,83 @@ public: static SMSGFMT s_aKill[20][2] = { { { "%s's %s destroys %s's %s!", 0 }, // ok! - { "%sÀÇ %s, %sÀÇ %sÀ»(¸¦) Æı«ÇÏ´Ù!", 0 }, // ok! + { "%s's %s destroyed %s's %s!", 0 }, // ok! }, { { "%s's %s explodes in a fire-ball, thanks to %s.", 1 }, // ok! - { "%sÀÇ %s, °¢ ±â°üºÎÀÇ È­¿°À¸·Î Æø¹ß! %sÀÇ Àý¹¦ÇÑ °ø°Ý¼º°ø!", 1 }, // ok! + { "%s's %s explodes in flames! %s lands a perfect hit!", 1 }, // ok! }, { { "%s delivers the last blow as %s's %s explodes in flames!", 2 }, // ok! - { "%s´Â %sÀÇ %s¿¡!", 2 - 100}, // ok! + { "%s took a hit to %s's %s!", 2 - 100}, // ok! }, { { "Smoking wreckage is all that's left of %s's %s after %s delivers the fatal blow!", 1 }, - { "%sÀÇ ¹«ÀÚºñÇÑ °ø°ÝÀ¸·Î %sÀÇ %s ºÒŸ´Â ÀÜÇظ¸ ³²±æ °ÍÀÌ´Ù.", 2 }, // ok! + { "%s's merciless assault leaves only burning wreckage of %s's %s.", 2 }, // ok! }, { { "Glorious victory goes to %s as the wreckage from %s's %s lies burning on the battlefield!", 2 }, - { "ÀüȲÀº ±Þ¼Óµµ·Î ÁøÀü, %sÀÇ »ýÁ¸°¡´É¼ºÀº 0%%!", 8 }, // ok! + { "The battle escalates rapidly - %s's survival probability is 0%%!", 8 }, // ok! }, { { "%s's %s is put out of it's misery by a devastating shot from %s.", 1 }, - { "%sÀÇ ¾ÐµµÀûÀÎ È­·Â ¾Õ¿¡ %s óÂüÈ÷ ¹«³ÊÁö°í ÀÖ´Ù.", 4 }, // ok! + { "Under %s's overwhelming firepower, %s crumbles miserably.", 4 }, // ok! }, { { "%s racks up another kill marker from reducing %s's %s to rubble!", 2 }, - { "%s %sÀÇ %sÀ»(¸¦) ¶§·Á ´¯È÷°í, »õ·Î¿î ų¸¶Å©¸¦ ¾ò¾ú´Ù.", 2 }, // ok! + { "%s knocked out %s's %s and earned a new kill mark.", 2 }, // ok! }, { { "Fresh paint is applied to %s's %s to mark the destruction of %s's %s!", 0 }, // ok! - { "%s´Â %s¸¦ °ÝÃßÇÑ Å³¸¶Å©¸¦ %s¿¡ Ãß°¡Çß´Ù.", 0 - 100 }, + { "%s added a kill mark on %s for shooting down %s.", 0 - 100 }, }, { { "The burning wreckage of %s's %s is a reminder to all of the prowess of %s's battle skills!", 1 }, - { "%sÀÇ ÀÜÇØ´Â %sÀÌ(°¡) °¡Á®°¥ ½Â¸®ÀÇ ±â³äÇ°ÀÌ µÉ°ÍÀÌ´Ù.", 7 }, // ok! + { "The wreckage of %s will be %s's trophy of victory.", 7 }, // ok! }, { { "The thunderous explosion of %s's %s is music to the ears of %s!", 1 }, - { "%sÀÇ ±Í¿¡ µé·Á¿À´Â Á×À½ÀÇ ÀüÁÖ°î. ÁöÈÖÀÚ´Â %s.", 7 }, // ok! + { "A death prelude echoes in %s's ears. The conductor: %s.", 7 }, // ok! }, { { "%s's %s is destroyed by %s's %s.", 3 }, - { "%s'ÀÇ %s, %sÀÇ %s¿¡°Ô Æı«µÇ¾ú´Ù.", 3 }, // ok! + { "%s's %s was destroyed by %s's %s.", 3 }, // ok! }, { { "%s brings the four horseman of the apocalypse down upon %s.", 4 }, - { "%s(ÀÌ)°¡ Èֵθ£´Â ½ÉÆÇÀÇ Ãß°¡ %s¿¡°Ô ÀÛ·ÄÇß´Ù.", 4 }, // ok! + { "The pendulum of judgment swung by %s strikes %s.", 4 }, // ok! }, { { "%s's life flashes as %s reduces the %s to a burning wreck.", 5 }, - { "%sÀÇ ¸¶Áö¸· »ý¸íÁÙ¿¡, %s !", 7 - 100 }, // ok! + { "On %s's last lifeline, %s!", 7 - 100 }, // ok! }, { { "%s is deafened by the resounding roar of the exploding %s, thanks to %s.", 1 }, - { "%s ±âüÀÇ Æø¹ß¼Ò¸®¿Í ÇÔ²², Àú Çϴ÷Π³¯¾Æ°¬´Ù. %s¿¡°Ô ¿µ±¤À»!", 7 }, // ok! + { "%s's mech explodes skyward. Glory to %s!", 7 }, // ok! }, { { "A kill marker is placed on %s's %s to mark the victory over %s.", 6 }, - { "%sÀÇ %s¿¡ »õ·Î¿î ų¸¶Å©¸¦ Ãß°¡ÇØ¾ß ÇÒ µí, Èñ»ýÀÚ´Â %s", 6 }, // ok! + { "A new kill mark should be added to %s's %s, victim: %s", 6 }, // ok! }, { { "%s is delivered unto the inferno with regards from %s.", 7 }, - { "%s, %sÀÇ È£À§ÇÏ¿¡ Áö¿ÁÀ¸·Î ÇâÇß´Ù. %s¿¡°Ô ¸íº¹À»!", 9 }, // ok! + { "%s headed to hell under %s's escort. Rest in peace, %s!", 9 }, // ok! }, { { "Another kill marker is given up by %s, as %s celebrates victory.", 7 }, - { "%s, %sÀÇ »õ·Î¿î ų ¸¶Å©°¡ µÇ¾ú´Ù. ¿µ¿øÇÑ ¾È½ÄÀ»¡¦", 7 - 100 }, + { "%s became %s's new kill mark. Rest in peace...", 7 - 100 }, }, { { "Best wishes in the afterlife are presented to %s from %s.", 7 }, - { "%s¿¡°Ô ³²Àº °ÍÀº ¿ÀÁ÷ %s¿¡ ´ëÇÑ º¹¼ö»Ó!", 7 }, // ok! + { "All that remains for %s is revenge against %s!", 7 }, // ok! }, { { "Tragedy strikes %s as %s guns the %s down.", 5 }, - { "%s ¸ðµç È­·ÂÀ» µ¿¿øÇØ %sÀÇ %sÀ»(¸¦) Æı«Çß´Ù.", 2 }, // ok! + { "%s brought all firepower to bear and destroyed %s's %s.", 2 }, // ok! }, { { "%s earns the revenge of %s after the tragic destruction of the %s.", 2 }, - { "%sÀÇ ºñ±ØÀûÀÎ ÃÖÈÄ! %s Àý¸ÁÇÏ´Â %sÀ»(¸¦) ÁöÄѺ¼ »ÓÀÌ´Ù.", 9 }, // ok! + { "A tragic end for %s! %s can only watch %s in despair.", 9 }, // ok! }, }; @@ -2077,11 +2077,11 @@ static SMSGFMT s_aKill[20][2] = { static SMSGFMT s_aSuicide[2][2] = { { { "%s leaves the battlefield in disgrace after causing the destruction of the %s.", 0 }, - { "%s ÀÚÆø! %s ºÒ¸í¿¹½º·´°Ô ÀüÀåÀ» ¶°³µ´Ù!", 2 }, + { "%s self-destructed! %s left the battlefield in disgrace!", 2 }, }, { { "%s will not grace the halls of the honored mechwarriors after self-destructing the %s.", 0 }, - { "%s ÀÚÆø! ºñ°ÌÀÚ¿©, Áø½Ç·Î ½Â¸®¸¦ ¿øÇϴ°¡?", 3 }, + { "%s self-destructed! Coward, do you truly desire victory?", 3 }, }, }; @@ -2106,43 +2106,43 @@ static SMSGFMT s_aSuicide[2][2] = { static SMSGFMT s_aShot[10][2] = { { { "%s's %s fires the %s and damages the %s of %s's %s.", 0 }, - { "%s %sÀÇ %s¿¡ %sÀ¸·Î °ø°ÝÇß´Ù", 1 }, // ok! + { "%s attacked %s's %s with %s", 1 }, // ok! }, { { "%s fires the %s's %s and decimates the %s of %s's %s.", 2 }, - { "%sÀÌ(°¡) ž½ÂÇÑ %s, %s·Î %sÀÌ(°¡) ž½ÂÇÑ %sÀÇ %s¿¡ ÇÇÇظ¦ ÀÔÇû´Ù.", 2 }, + { "%s piloting %s damaged %s's %s on %s's %s.", 2 }, }, { { "%s's %s takes a devastating hit in the %s from %s.", 3 }, - { "%sÀÇ %s, %sÀÇ ¾ÐµµÀûÀÎ °ø°Ý¿¡ %s¿¡ ÇÇÇظ¦ ÀÔ¾ú´Ù.", 4 }, // ok! + { "%s's %s took damage to the %s under %s's overwhelming attack.", 4 }, // ok! }, { { "%s's %s suffers a direct hit to it's %s from %s's %s.", 5 }, - { "%sÀÇ %sÀº(´Â) %sÀÇ %s¿¡ Á÷Á¢ÀûÀÎ ÇÇÇظ¦ ¹Þ¾Ò´Ù. ÇÇÇØ %s!", 6 -100}, + { "%s's %s took direct damage from %s's %s. Damage: %s!", 6 -100}, }, { { "%s damages %s's %s.", 7 }, - { "%s, %sÀÇ %s¿¡ ÇÇÇظ¦ ÀÔÇû´Ù..", 7 }, // ok! + { "%s dealt damage to %s's %s..", 7 }, // ok! }, { { "Dense black smoke pours from %s's %s as a result of %s's targeted hit.", 8 }, - { "%sÀÇ Àý¹¦ÇÑ °ø°ÝÀ¸·Î %sÀÇ %s¿¡¼­ °ËÀº ¿¬±â°¡ ÆÛÁö°í ÀÖ´Ù.", 7 }, // ok! + { "Black smoke billows from %s's %s from %s's precise attack.", 7 }, // ok! }, { { "Fire boils from the damaged %s of %s's %s after %s hits it with a %s.", 9 }, - { "%s %sÀ»(¸¦) ¹ß»çÇÏ¿©, %sÀÌ(°¡) ž½ÂÇÑ %sÀÇ %s¿¡ ÇÇÇظ¦ ¹ß»ý½ÃÄ×´Ù.", 10 }, // ok! + { "%s fired %s, dealing damage to the %s of %s's %s.", 10 }, // ok! }, { { "Smoke and fire are trailing from %s's %s, all results of the %s blast inflicted by %s.", 11 }, - { "%sÀÇ %s °ø°Ý¿¡, ºÒ°ú ¿¬±â°¡ %sÀÇ ±âü¸¦ µÚµ¤°í ÀÖ´Ù.", 15 }, // ok! + { "Fire and smoke engulf %s's mech from %s's %s attack.", 15 }, // ok! }, { { "%s targets and fires the %s; %s cries in dismay as the %s's %s is damaged.", 10 }, - { "%s %sÀ»(¸¦) Á¶ÁØÇÏ¿© %sÀÌ(°¡) ž½ÂÇÑ %sÀÇ %s¿¡ ¸ÂÃá ÈÄ ¹æ¾Æ¼è¸¦ ´ç°å´Ù.", 10 }, // ok! + { "%s aimed %s and pulled the trigger, hitting the %s of %s's %s.", 10 }, // ok! }, { { "%s takes a severe wound to the %s as %s aims for the %s again.", 13 }, - { "%s ´Ù½Ã %sÀÇ %sÀ»(¸¦) Á¶ÁØÇÏ¿© »ç°ÝÇß´Ù. %s, %s¿¡ ½É°¢ÇÑ ÇÇÇظ¦ ÀÔÀº µí.", 14 -100}, + { "%s aimed again at %s's %s and fired. %s seems to have taken serious damage to %s.", 14 -100}, }, }; @@ -2150,19 +2150,19 @@ static SMSGFMT s_aShot[10][2] = { static SMSGFMT s_aCTF[1][2] = { { { "%s captured flag.", 0 }, - { "%s, ±ê¹ß ȹµæ!.", 0 }, + { "%s captured the flag!", 0 }, }, }; static SMSGFMT s_aFBK[1][2] = { { { "%s destroyed friendly building.", 0 }, - { "%s, ±ê¹ß ȹµæ!.", 0 }, + { "%s captured the flag!", 0 }, }, }; static SMSGFMT s_aEBK[1][2] = { { { "%s destroyed enemy building.", 0 }, - { "%s, ±ê¹ß ȹµæ!.", 0 }, + { "%s captured the flag!", 0 }, }, }; const SMSGFMT* pcFMT; diff --git a/Gameleap/code/mw4/Code/MW4Application/Cstr.cpp b/Gameleap/code/mw4/Code/MW4Application/Cstr.cpp index 78a8b128..cabf94a1 100644 --- a/Gameleap/code/mw4/Code/MW4Application/Cstr.cpp +++ b/Gameleap/code/mw4/Code/MW4Application/Cstr.cpp @@ -1077,7 +1077,7 @@ int CStrArray::GetTotalLength() const int nTotalLength; int i, nSize = GetSize(); - nTotalLength = nSize; // nSize°³ÀÇ '\0' + nTotalLength = nSize; // nSize null terminators '\0' for(i = 0; i < nSize; i++) { nTotalLength += strlen(GetAt(i)); } diff --git a/Gameleap/code/mw4/Code/MW4Application/Eula.cpp b/Gameleap/code/mw4/Code/MW4Application/Eula.cpp index 5876192d..d4982656 100644 --- a/Gameleap/code/mw4/Code/MW4Application/Eula.cpp +++ b/Gameleap/code/mw4/Code/MW4Application/Eula.cpp @@ -2,7 +2,7 @@ #include // -//Do not use ….\EulaTest\\1.0 as the key for your game; use your game name and version instead… +//Do not use ....\EulaTest\\1.0 as the key for your game; use your game name and version instead... // PLEASE NOTE: do not place backslashes on beginning or end of regkey. // @@ -11,7 +11,7 @@ typedef DWORD (*EBUPROC) (LPCTSTR lpRegKeyLocation, LPCTSTR lpEULAFileName, LPCSTR lpWarrantyFileName, BOOL fCheckForFirstRun); // -//The game application’s .RC file should define strings for the EULA and WARRANTY pathnames… +//The game application's .RC file should define strings for the EULA and WARRANTY pathnames... // @@ -28,13 +28,13 @@ bool FirstRunEula(const char *eula_filename,const char *warranty_filename) if (NULL == hMod) hMod = LoadLibrary("EBUEula.dll"); - if (NULL == hMod) // can’t attach to DLL + if (NULL == hMod) // can't attach to DLL { STOP(("Cannot Load EBUEula.dll")); } pfnEBUEula = (EBUPROC) GetProcAddress(hMod, "EBUEula"); - if (NULL == pfnEBUEula) // can’t find entry point + if (NULL == pfnEBUEula) // can't find entry point { FreeLibrary(hMod); STOP(("Cannot Find Entry Point to EBUEula.dll")); @@ -43,9 +43,9 @@ bool FirstRunEula(const char *eula_filename,const char *warranty_filename) // //This call enables both EULA and warranty accepting/viewing/printing. If your - //game doesn’t ship with a WARRANTY file, specifiy NULL instead of szWarranty… + //game doesn't ship with a WARRANTY file, specifiy NULL instead of szWarranty... - //The code below, for instance, works with both OEM and retail builds… + //The code below, for instance, works with both OEM and retail builds... // const char *pszWarrantyParam = 0xFFFFFFFF != GetFileAttributes(warranty_filename) ? warranty_filename : NULL; diff --git a/Gameleap/code/mw4/Code/MW4Application/MW4Application.cpp b/Gameleap/code/mw4/Code/MW4Application/MW4Application.cpp index c236875d..3c051e6d 100644 --- a/Gameleap/code/mw4/Code/MW4Application/MW4Application.cpp +++ b/Gameleap/code/mw4/Code/MW4Application/MW4Application.cpp @@ -190,10 +190,10 @@ int bloatSizeTable[8] = { extern bool(__cdecl *NoCDMessageFunction)(void); extern bool gNoDialogs; -//»óÈÆ.. begin +//sanghoon begin extern bool use_shgui; extern int SCREENS; -//»óÈÆ.. end +//sanghoon end bool gRunEula=true; bool gNoCD=false; @@ -290,13 +290,13 @@ void _stdcall InitializeGameEngine() // bool needflip=Environment.fullScreen && IsFirstRun(); - //»óÈÆ ¾Õ + //sanghoon begin bool needflip=false; - //»óÈÆ µÚ + //sanghoon end if(needflip){ - //»óÈÆ ¾Õ + //sanghoon begin //MessageBeep(MB_ICONEXCLAMATION); - //»óÈÆ µÚ + //sanghoon end EnterWindowMode(); } @@ -336,7 +336,7 @@ void _stdcall InitializeGameEngine() { //Original //page->GetEntry("videodriverindex",&Environment.FullScreenDevice); - //»óÈÆ + //sanghoon Environment.FullScreenDevice=0; page->GetEntry("antialias",&Environment.AntiAlias); page->GetEntry("bitdepth",&Environment.bitDepth); @@ -355,7 +355,7 @@ void _stdcall InitializeGameEngine() //Original //page->GetEntry("HudDamageMode",&VehicleInterface::hudDamageMode); //page->GetEntry("HudTargetDamageMode",&VehicleInterface::hudTargetDamageMode); - //»óÈÆ + //sanghoon VehicleInterface::hudDamageMode=false; VehicleInterface::hudTargetDamageMode=false; } @@ -1088,9 +1088,9 @@ DWORD __stdcall gos_EnableSetting( gosSetting Setting, DWORD Value ); Environment.soundDisable = (strstr(all_lower, "-nosound") != NULL); Environment.fullScreen = (strstr(all_lower, "-window") == NULL); - //»óÈƯ.. begin + //sanghoon begin use_shgui=Environment.fullScreen?1:0; - //»óÈƯ.. end + //sanghoon end gNoAutoConfig= (strstr(all_lower, "-noautoconfig") != NULL); diff --git a/Gameleap/code/mw4/Code/MW4Application/ctcl.cpp b/Gameleap/code/mw4/Code/MW4Application/ctcl.cpp index 81b44488..e127920e 100644 --- a/Gameleap/code/mw4/Code/MW4Application/ctcl.cpp +++ b/Gameleap/code/mw4/Code/MW4Application/ctcl.cpp @@ -517,7 +517,7 @@ void CSOC_Server::OnSendFile() BYTE bCode; if (Disassemble("B", &bCode)) { ASSERT((bCode == 0) || (bCode == 3)); - // ¹Þ¾Æ°¡½Ã¿À from Game to console... + // Receiving from Game to console... SYSTEMTIME* pSysTime; WORD wSysTimeSize; GUID* pGUID; @@ -533,7 +533,7 @@ void CSOC_Server::OnSendFile() pSF = g_pCTCLManager->m_SFM_Recv.Find(*pGUID, nType); if (pSF) { if (bCode == 3) { - // ¹Ì¼Ç¸®ºä ¼­¹ö°¡ mission review ¹Þ¾Ò´Ù´Â °ÍÀ» ¹Þ¾Ò´À³Ä? + // Did we receive confirmation the mission review server got the mission review? pSF->m_bProcessed = true; g_pCTCLManager->m_SFM_Recv.Cut(pSF); g_pCTCLManager->m_SFM_Done.AddTail(pSF); @@ -910,7 +910,7 @@ void CSOC_Client::OnSendFile() BYTE bCode; if (Disassemble("B", &bCode)) { ASSERT((bCode == 1) || (bCode == 2)); - // ¹Þ¾Ò¿À from console to Game... + // Received from console to Game... SYSTEMTIME* pSysTime; WORD wSysTimeSize; GUID* pGUID; @@ -1437,21 +1437,21 @@ void CCTCLManager::Run() #endif // !defined(CTCL_LAUNCHER) } else { /* - Ŭ¶óÀ̾ðÆ®³ª ¼­¹öÀÇ °æ¿ì ½ÇÇàµÇ´Â ÄÚµåÀÌ´Ù. + Code executed for both client and server. - *ÀÖÀ»¼ö ÀÖ´Â »óŵé - ¼­¹ö/Ŭ¶óÀ̾ðÆ®°¡ °áÁ¤µÇ±âÀü.. ¸í·É ´ë±â»óÅ - (Á¾·á/¼­¹ö½ÃÀÛ/Ŭ¶óÀ̾ðÆ® ½ÃÀÛµîÀÇ ¸í·ÉÀÌ ¿Ã¼ö ÀÖ´Ù.) + *Possible states: + Before server/client role is determined: waiting for commands + (Commands such as exit/start-server/start-client may arrive.) - ¼­¹ö·Î ½ÇÇàµÇ¾î ¼­¹ö ¸ÞÅ© ¼³Á¤¿¡ ´ëÇÑ µ¥ÀÌŸ¸¦ ±â´Ù¸®´Â »óÅ - (CreateSession°¡ ½ÇÇàµÈ »óÅÂÀÌ´Ù.) - ¼­¹ö·Î ½ÇÇàµÇ¾î Botµé¿¡ ´ëÇÑ Á¤º¸¸¦ ±â´Ù¸®´Â »óÅ - (Ŭ¶óÀ̾ðÆ®ÀÇ Âü¿©´Â Ŭ¶óÀ̾ðÆ®¿Í ¼­¹ö°£¿¡ ÀÚµ¿À¸·Î ÀÌ·ç¾îÁø´Ù.) - ¼­¹ö·Î ½ÇÇàµÇ¾î Launch¸¦ ±â´Ù¸®´Â »óÅ + Running as server, waiting for server mech configuration data + (State after CreateSession has been called.) + Running as server, waiting for Bot information + (Client joining happens automatically between client and server.) + Running as server, waiting for Launch - ==>Ŭ¶óÀ̾ðÆ®´Â ½ÇÇàÁï½Ã µ¥ÀÌŸµéÀÌ Àü´ÞµÇ¹Ç·Î ´ë±â»óÅ°¡ ¾ø´Ù. + ==>Client has no waiting state as data is transferred immediately on startup. - ==>°¢°¢ÀÇ »óŸ¦ Á¤ÀÇÇÏ°í °¢ »óÅ¿¡ ¸Â´Â 󸮸¦ ÇØÁÖ¸é µÈ´Ù. + ==>Define each state and implement the appropriate handling for each. switch(state){ } */ @@ -1533,8 +1533,8 @@ void CCTCLManager::DoMech4Comm() } break; case 1: - //¼­¹ö/Ŭ¶óÀ̾ðÆ®·Î¼­ ½ÇÇàÁغñÇϵµ·Ï ¸í·ÉÀ» Àü´ÞÇÑ´Ù. - //¶ÇÇÑ ¼­¹ö¸¦ ½ÇÇàÇϴµ¥ ÇÊ¿äÇÑ ¸ðµç ÆĶó¹ÌÅ͵µ ÇÔ²² Àü´ÞÇÑ´Ù. + //Send command to prepare for execution as server/client. + //Also transmit all parameters required to run the server. for(i = 0; i < g_nPlayerInfos; i++) { SPlayerInfo& pi = g_aPlayerInfos[i]; if (!pi.m_bBot) { @@ -1561,12 +1561,12 @@ void CCTCLManager::DoMech4Comm() } } if (i == g_nPlayerInfos) { - // Botµé¿¡ ´ëÇÑ Á¤º¸¸¦ ¸ðµÎ Çѵ¥ ¹­¾î¼­ º¸³½´Ù. + // Bundle and send all Bot information together. CPacket pak(&SVR.GetGameSOC()); pak.Assemble("B", C_BOTS); for(i = 0; i < g_nPlayerInfos; i++) { - if (i != g_nServer) { // ¿ø·¡ Bot¸¸ Áö±ÝÀº ¼­¹ö¸¦ Á¦¿ÜÇÑ ÀüºÎ... + if (i != g_nServer) { // Originally bots only; now everyone except the server... SPlayerInfo& pi = g_aPlayerInfos[i]; pak.Assemble("BnsDWwsnn", pi.m_bBot, pi.m_nLevelOrTesla, pi.m_szName, pi.m_nMechIndex, pi.m_fileID, pi.m_recordID, pi.m_szMech, pi.m_nTeamOrSkin, pi.m_nDecal); } @@ -1577,10 +1577,10 @@ void CCTCLManager::DoMech4Comm() } break; case 4: - // °ÔÀÓÀÌ ¼º°øÀûÀ¸·Î ¸¸µé¾îÁö¸é ¼­¹ö¿Í Ŭ¶óÀ̾ðÆ®µéÀÇ Mech¿¡ ´ëÇÑ Á¤º¸µéÀ» SetÇÑ´Ù... + // Once the game is successfully created, set Mech info for server and all clients... if (SOCGame.m_nGameReturn == _EGR_OkCreateSession) { for(i = 0; i < g_nPlayerInfos; i++) { - if (i != g_nServer) { // ¼­¹ö´Â ÀÌ¹Ì SetMech¿¡ ÁøÀÔÇÑ »óÅÂ... + if (i != g_nServer) { // Server has already entered SetMech... SPlayerInfo& pi = g_aPlayerInfos[i]; if (!pi.m_bBot) { CTeslaInfo& ti = m_aTIs.GetAt(pi.m_nLevelOrTesla); @@ -1593,8 +1593,8 @@ void CCTCLManager::DoMech4Comm() } break; case 6: - //¸ðµç Ŭ¶óÀ̾ðµåµéÀÌ ¼­¹ö¿¡ Âü¿©Çϱ⸦ ±â´Ù¸°´Ù.<==ÀÌ ÀÀ´äÀº ¼­¹ö·Î ºÎÅÍ ¾òÀ» ¼ö ÀÖ´Ù. - //Âü¿©°¡ ¸ðµÎ ³¡³µÀ¸¸é, ¼­¹ö·Î ÇÏ¿©±Ý °ÔÀÓÀ» Launch½ÃÅ°µµ·Ï ÇÑ´Ù. + //Wait for all clients to join the server. <==This response comes from the server. + //Once all clients have joined, instruct the server to Launch the game. if (SOCGame.m_nGameReturn == _EGR_OkLaunchReady) { g_nMech4Comm = 9; } diff --git a/Gameleap/code/mw4/Code/MW4Application/ctcl.h b/Gameleap/code/mw4/Code/MW4Application/ctcl.h index 41515b53..080fbea1 100644 --- a/Gameleap/code/mw4/Code/MW4Application/ctcl.h +++ b/Gameleap/code/mw4/Code/MW4Application/ctcl.h @@ -42,7 +42,7 @@ public: const char* m_pcsz; int m_nLauncherConnection; // 0: no connection, +1: connection, -1: connecting - int m_nConnection2; // m_bCameraShip°ª¿¡ µû¶ó °ÔÀÓ È¤Àº Ä«¸Þ¶ó ½±°úÀÇ Á¢¼ÓÀ» ÀǹÌ, 0: no connection, +1: connection, -1: connecting + int m_nConnection2; // Connection to game or camera ship per m_bCameraShip, 0: no connection, +1: connected, -1: connecting int m_nApplType; int m_nApplState; int m_nGameState; diff --git a/Gameleap/code/mw4/Code/MW4Application/ctime.cpp b/Gameleap/code/mw4/Code/MW4Application/ctime.cpp index 89317a07..60c547c4 100644 --- a/Gameleap/code/mw4/Code/MW4Application/ctime.cpp +++ b/Gameleap/code/mw4/Code/MW4Application/ctime.cpp @@ -44,7 +44,7 @@ int GetDayEnd(int nYear, int nMonth) long GetTotalSeconds(int nYear, int nMonth, int nDay) { - // nYear, nMonth, nDay³¯ÀÇ 0½Ã 0ºÐ 0Ãʸ¦ 0À¸·Î ÇÑ ÃÊ´ÜÀ§ ¼ö... + // Seconds elapsed since 00:00:00 on the date nYear/nMonth/nDay... ASSERT(nYear >= 1970); ASSERT((1 <= nMonth) && (nMonth <= 12)); ASSERT(1 <= nDay); @@ -57,13 +57,13 @@ long GetTotalSeconds(int nYear, int nMonth, int nDay) if (IsLeapYear(nStart)) { nDays++; } - lTotal += nDays * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += nDays * 24 * 60 * 60; // 24 hours * 60 min * 60 sec } for(nStart = 1; nStart < nMonth; nStart++) { int nDayEnd = GetDayEnd(nYear, nStart); - lTotal += nDayEnd * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += nDayEnd * 24 * 60 * 60; // 24 hours * 60 min * 60 sec } - lTotal += (nDay - 1) * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += (nDay - 1) * 24 * 60 * 60; // 24 hours * 60 min * 60 sec return lTotal; } diff --git a/Gameleap/code/mw4/Code/MW4Application/ctime.h b/Gameleap/code/mw4/Code/MW4Application/ctime.h index 835eb000..eb787ad3 100644 --- a/Gameleap/code/mw4/Code/MW4Application/ctime.h +++ b/Gameleap/code/mw4/Code/MW4Application/ctime.h @@ -16,7 +16,7 @@ class CTimeDate public: union { struct { - // Bit Field´Â ¾ÕÂÊ¿¡ ÁöÁ¤µÈ °ÍÀÌ LowBitÀÌ´Ù. + // Bit Fields declared first are at the low-bit end. DWORD m_xDay: 5; // 2^0, 2^5-1 DWORD m_xMonth: 4; // 2^5, 2^4-1 DWORD m_xYear: TIMEDATE_YEAR_BITS; // from 1900-2155 // 2^9, 2^8-1 diff --git a/Gameleap/code/mw4/Code/MW4Application/mugSocs.cpp b/Gameleap/code/mw4/Code/MW4Application/mugSocs.cpp index 4488c3cf..55e830ca 100644 --- a/Gameleap/code/mw4/Code/MW4Application/mugSocs.cpp +++ b/Gameleap/code/mw4/Code/MW4Application/mugSocs.cpp @@ -1375,7 +1375,7 @@ void CSockAddr::SetTarget(const char* pcszAddr) { if (pcszAddr) { sin_addr.s_addr = inet_addr(pcszAddr); - if (sin_addr.s_addr == INADDR_ANY) { // 0.0.0.0À̱⠶§¹®¿¡ HOST/Network Addr¹«°ü + if (sin_addr.s_addr == INADDR_ANY) { // 0.0.0.0, HOST/Network Addr irrelevant hostent* pHN = gethostbyname(pcszAddr); if (pHN) { sin_addr.s_addr = *(u_long*)pHN->h_addr; @@ -3667,7 +3667,7 @@ CSOCListen* CSOCManager::DoListen(int nPort, PFN_CreateSOCClient pfnCSC, DWORD d pSOCListen = new CSOCListen(nPort); pSOCListen->SetCSCParam(pfnCSC, dwCSCParam1, dwCSCParam2); if (!DoListen(pSOCListen, nPort)) { - // °°Àº Æ÷Æ®¸¦ 2¹ø Listen ÇÏ´Â °æ¿ì?... + // Case of Listen on the same port twice?... pSOCListen = NULL; } diff --git a/Gameleap/code/mw4/Code/MW4Application/mugsocs.h b/Gameleap/code/mw4/Code/MW4Application/mugsocs.h index e0495c0a..4df009db 100644 --- a/Gameleap/code/mw4/Code/MW4Application/mugsocs.h +++ b/Gameleap/code/mw4/Code/MW4Application/mugsocs.h @@ -41,7 +41,7 @@ extern char SERVERID[]; #endif // !MAX_PACKET #ifndef MAX_FTPBUF #define MAX_FTPBUF 1024 -// MAX_FTPBUF´Â MAX_PACKETº¸´Ù ¹Ýµå½Ã ÀÛ¾Æ¾ß ÇÑ´Ù? +// MAX_FTPBUF must be smaller than MAX_PACKET? // 9+size==sizeof(bCmd) + sizeof(FTID) + sizeof(size) + size #endif // !MAX_FTPBUF @@ -251,7 +251,7 @@ private: #define ESTRF_USER_START 100 -#define ESTRF_PASSWORDCHANGED 110 // ·Î±×ÀÎÇÏ°í ÀÖ´Â µ¿¾È¿¡ Æнº¿öµå°¡ ¹Ù²ñ +#define ESTRF_PASSWORDCHANGED 110 // Password changed while logged in void Randomize(); @@ -268,7 +268,7 @@ union UPacketValue class CDAPacket : public SOCBase_Class { -// PacketÀÇ ¾Õ ºÎºÐÀ» ó¸®ÇÏ°í ³­ µÞ ºÎºÐÀÇ °¡º¯ ÆĶó¹ÌÅÍ... +// Variable parameters in the tail portion after processing the packet header... public: BYTE m_bCmd; BYTE m_bReserved; @@ -361,8 +361,8 @@ public: #define C_ROOM_MAKE 232 // s - name, s - password #define C_ROOM_JOIN 233 -// d - number(RoomÀ» ¶°³ª´Â °ÍÀº -1), s - password -#define S_ROOM_JOIN 233 // C_ROOM_MAKE/C_ROOM_JOINÀÇ °á°ú... +// d - number (leaving a Room = -1), s - password +#define S_ROOM_JOIN 233 // Result of C_ROOM_MAKE/C_ROOM_JOIN... // b - code(CSCODE_OK or error code), d - number #define C_ROOM_UPDS 234 // CSCODE_... + @ @@ -384,13 +384,13 @@ public: #define S_FTP 254 //... see ftp.txt #define X_KEEPALIVE 255 // no parameters, should be ignored... -#define TX_SYSTEM 0 // ½Ã½ºÅÛ ¸Þ½ÃÁö... -#define TX_NORMAL 1 // ÀÏ¹Ý Ã¤Æà ÅؽºÆ® -#define TX_WARNING 2 // °æ°í -#define TX_ERROR 3 // ¿À·ù -#define TX_FATAL 4 // Ä¡¸íÀûÀÎ ¿À·ù -#define TX_INFO 5 // »ç¿ëÀÚ Á¤º¸ µîÀÇ Information Result... -#define TX_SAY 6 // ±Ó¼Ó¸» +#define TX_SYSTEM 0 // System message... +#define TX_NORMAL 1 // Regular chat text +#define TX_WARNING 2 // Warning +#define TX_ERROR 3 // Error +#define TX_FATAL 4 // Fatal error +#define TX_INFO 5 // Information result (e.g. user info)... +#define TX_SAY 6 // Whisper #define TX_LOCAL 7 // local echo.... #define TX_UNKNOWN 0xffff // unknown... @@ -493,7 +493,7 @@ CPacket protected: CSOC* m_pSOC; private: - // ÀÌ ¾ÈÀÇ ºí·°Àº ¹Ýµå½Ã ¿¬¼ÓÇØ¾ß ÇÑ´Ù... + // The block within must be contiguous... WORD m_wLen; BYTE m_ba[MAX_PACKET]; // @@ -587,7 +587,7 @@ end of variable PACKET_MAP definitions... class CFileTransfer : public TDBLNK(CFileTransfer*) { public: - // ¼­¹ö·Î ºÎÅÍ ¹ÞÀº Á¤º¸... - ȤÀº Ŭ¶óÀ̾ðÆ®¿¡°Ô ÀüÇØÁÙ Á¤º¸... + // Information received from server... - or information to relay to client... BOOL m_bClientSite; DWORD m_dwFTID; DWORD m_dwGUARD; @@ -680,18 +680,18 @@ protected: // time out to Drop... DWORD m_dwKARcvTimeOut; #ifdef WIN32 - // º¸Åë Login°úÁ¤¿¡ ¾²ÀÌ´Â À©µµ¿ì ÇÚµé + // Window handle typically used during Login process HWND m_hWndOwner; #endif // WIN32 - // º¸Åë ±Û·Î¹ú º¯¼ö·Î ¾²ÀÌ´Â ¼ÒÄÏÆ÷ÀÎÅÍ¿¡ ´ëÇÑ ÀÚµ¿ NULL AssignÀ» À§ÇÏ¿© + // For auto NULL assignment of socket pointer typically used as a global variable PSOC* m_ppSOC; - // ¼ÒÄÏÀ» ±¸ºÐÇϱâ À§ÇÏ¿© »ç¿ëÀÚ ÇÁ·Î±×·¥¿¡¼­ ¾²ÀÌ´Â ¾ÆÀ̵ð - // ÁÖ·Î ¼­¹öÀÇ °æ¿ì¿¡´Â Ŭ¶óÀ̾ðÆ®°¡ Á¢¼ÓÇÒ ¶§¸¶´Ù °íÀ¯ ¾ÆÀ̵𸦠ºÎ¿©ÇÏ¿© »ç¿ë - // ÇϳªÀÇ Client°¡ ´Ù¼öÀÇ ¼­¹ö¿¡ Á¢¼ÓÇÒ ¶§(ÁÖ·Î StarÇü) °¢°¢ÀÇ Á¢¼ÓÀ» ±¸ºÐÇÒ ¶§ »ç¿ë - // Ŭ¶óÀ̾ðÆ®°¡ ÇϳªÀÇ ¼­¹ö¿¡¸¸ Á¢¼ÓÇÏ´Â °æ¿ì Ŭ¶óÀ̾ðÆ®°¡ ¼­¹ö¿¡ Á¢¼Ó ÁßÀÎÁö ȤÀº Á¢¼ÓÇß´ÂÁö¸¦ ÆÇ´ÜÇÒ ¶§ - // CSOCManager::FindSOC(CSOC_SERVER_ID==default)->GetConnectionState()¸¦ »ç¿ë. - // limits.h¸¦ includeÇؾßÇÔ. - // CSOC»ý¼º½ÃÀÇ ±âº»°ª: CSOCServer == CSOC_SERVER_ID(=INT_MIN), CSOCClient == CSOC_CLIENT_ID(=0), CSOCListen == CSOC_LISTEN_ID(=-1) + // ID used in user program to identify a socket + // Mainly for servers: assigns a unique ID each time a client connects + // Used to distinguish each connection when a client connects to multiple servers (Star topology) + // When a client connects to only one server: used to check if client is connecting or already connected + // Use CSOCManager::FindSOC(CSOC_SERVER_ID==default)->GetConnectionState(). + // Must include limits.h. + // Default values at CSOC creation: CSOCServer==CSOC_SERVER_ID(INT_MIN), CSOCClient==CSOC_CLIENT_ID(0), CSOCListen==CSOC_LISTEN_ID(-1) union { int m_nID; UINT m_uID; @@ -725,8 +725,8 @@ protected: DWORD m_xGracefulRemote: 1; DWORD m_xAbortyLocal: 1; DWORD m_xAbortyRemote: 1; - DWORD m_xLoginStarted: 1; // »ç¿ëÀÚ°¡ Á÷Á¢ °ªÀ» SettingÇØ¾ß ÇÑ´Ù. - DWORD m_xLoginOK: 1; // »ç¿ëÀÚ°¡ Á÷Á¢ °ªÀ» SettingÇØ¾ß ÇÑ´Ù. + DWORD m_xLoginStarted: 1; // Must be set directly by the caller. + DWORD m_xLoginOK: 1; // Must be set directly by the caller. } m_DW; DWORD m_dwVarFlags; }; diff --git a/Gameleap/code/mw4/Code/MW4Application/nonmfc.h b/Gameleap/code/mw4/Code/MW4Application/nonmfc.h index 0802a8a3..cfbf5f2a 100644 --- a/Gameleap/code/mw4/Code/MW4Application/nonmfc.h +++ b/Gameleap/code/mw4/Code/MW4Application/nonmfc.h @@ -6,7 +6,7 @@ inline BOOL AssertDialog(const char* pcszExpr, const char* pcszfile, int nLine) { char szBuf[MAX_PATH * 2]; - sprintf(szBuf, "\"%s\" ÆÄÀÏÀÇ %dÁÙ¿¡¼­ ASSERT!!!\n\nµð¹ö±ëÀ» ÇϽðڽÀ´Ï±î?", pcszfile, nLine); + sprintf(szBuf, "ASSERT!!! in \"%s\" at line %d\n\nDo you want to debug?", pcszfile, nLine); #ifdef WIN32 return ::MessageBox(NULL, szBuf, pcszExpr, MB_YESNO) == IDYES; diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/Cstr.cpp b/Gameleap/code/mw4/Code/MW4GameEd2/Cstr.cpp index 78a8b128..cabf94a1 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/Cstr.cpp +++ b/Gameleap/code/mw4/Code/MW4GameEd2/Cstr.cpp @@ -1077,7 +1077,7 @@ int CStrArray::GetTotalLength() const int nTotalLength; int i, nSize = GetSize(); - nTotalLength = nSize; // nSize°³ÀÇ '\0' + nTotalLength = nSize; // nSize null terminators '\0' for(i = 0; i < nSize; i++) { nTotalLength += strlen(GetAt(i)); } diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/GameInterface.cpp b/Gameleap/code/mw4/Code/MW4GameEd2/GameInterface.cpp index d997974d..bfbec552 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/GameInterface.cpp +++ b/Gameleap/code/mw4/Code/MW4GameEd2/GameInterface.cpp @@ -3092,13 +3092,13 @@ bool FirstRunEula(const char *eula_filename,const char *warranty_filename) if (NULL == hMod) hMod = LoadLibrary("EBUEula.dll"); - if (NULL == hMod) // can’t attach to DLL + if (NULL == hMod) // can't attach to DLL { STOP(("Cannot Load EBUEula.dll")); } pfnEBUEula = (EBUPROC) GetProcAddress(hMod, "EBUEula"); - if (NULL == pfnEBUEula) // can’t find entry point + if (NULL == pfnEBUEula) // can't find entry point { FreeLibrary(hMod); STOP(("Cannot Find Entry Point to EBUEula.dll")); @@ -3107,9 +3107,9 @@ bool FirstRunEula(const char *eula_filename,const char *warranty_filename) // //This call enables both EULA and warranty accepting/viewing/printing. If your - //game doesn’t ship with a WARRANTY file, specifiy NULL instead of szWarranty… + //game doesn't ship with a WARRANTY file, specifiy NULL instead of szWarranty... - //The code below, for instance, works with both OEM and retail builds… + //The code below, for instance, works with both OEM and retail builds... // const char *pszWarrantyParam = 0xFFFFFFFF != GetFileAttributes(warranty_filename) ? warranty_filename : NULL; diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/ctcl.cpp b/Gameleap/code/mw4/Code/MW4GameEd2/ctcl.cpp index c9aeaf79..1dcc282b 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/ctcl.cpp +++ b/Gameleap/code/mw4/Code/MW4GameEd2/ctcl.cpp @@ -517,7 +517,7 @@ void CSOC_Server::OnSendFile() BYTE bCode; if (Disassemble("B", &bCode)) { ASSERT((bCode == 0) || (bCode == 3)); - // ¹Þ¾Æ°¡½Ã¿À from Game to console... + // Receiving from Game to console... SYSTEMTIME* pSysTime; WORD wSysTimeSize; GUID* pGUID; @@ -533,7 +533,7 @@ void CSOC_Server::OnSendFile() pSF = g_pCTCLManager->m_SFM_Recv.Find(*pGUID, nType); if (pSF) { if (bCode == 3) { - // ¹Ì¼Ç¸®ºä ¼­¹ö°¡ mission review ¹Þ¾Ò´Ù´Â °ÍÀ» ¹Þ¾Ò´À³Ä? + // Did we receive confirmation the mission review server got the mission review? pSF->m_bProcessed = true; g_pCTCLManager->m_SFM_Recv.Cut(pSF); g_pCTCLManager->m_SFM_Done.AddTail(pSF); @@ -910,7 +910,7 @@ void CSOC_Client::OnSendFile() BYTE bCode; if (Disassemble("B", &bCode)) { ASSERT((bCode == 1) || (bCode == 2)); - // ¹Þ¾Ò¿À from console to Game... + // Received from console to Game... SYSTEMTIME* pSysTime; WORD wSysTimeSize; GUID* pGUID; @@ -1438,21 +1438,21 @@ void CCTCLManager::Run() #endif // !defined(CTCL_LAUNCHER) } else { /* - Ŭ¶óÀ̾ðÆ®³ª ¼­¹öÀÇ °æ¿ì ½ÇÇàµÇ´Â ÄÚµåÀÌ´Ù. + Code executed for both client and server. - *ÀÖÀ»¼ö ÀÖ´Â »óŵé - ¼­¹ö/Ŭ¶óÀ̾ðÆ®°¡ °áÁ¤µÇ±âÀü.. ¸í·É ´ë±â»óÅ - (Á¾·á/¼­¹ö½ÃÀÛ/Ŭ¶óÀ̾ðÆ® ½ÃÀÛµîÀÇ ¸í·ÉÀÌ ¿Ã¼ö ÀÖ´Ù.) + *Possible states: + Before server/client role is determined: waiting for commands + (Commands such as exit/start-server/start-client may arrive.) - ¼­¹ö·Î ½ÇÇàµÇ¾î ¼­¹ö ¸ÞÅ© ¼³Á¤¿¡ ´ëÇÑ µ¥ÀÌŸ¸¦ ±â´Ù¸®´Â »óÅ - (CreateSession°¡ ½ÇÇàµÈ »óÅÂÀÌ´Ù.) - ¼­¹ö·Î ½ÇÇàµÇ¾î Botµé¿¡ ´ëÇÑ Á¤º¸¸¦ ±â´Ù¸®´Â »óÅ - (Ŭ¶óÀ̾ðÆ®ÀÇ Âü¿©´Â Ŭ¶óÀ̾ðÆ®¿Í ¼­¹ö°£¿¡ ÀÚµ¿À¸·Î ÀÌ·ç¾îÁø´Ù.) - ¼­¹ö·Î ½ÇÇàµÇ¾î Launch¸¦ ±â´Ù¸®´Â »óÅ + Running as server, waiting for server mech configuration data + (State after CreateSession has been called.) + Running as server, waiting for Bot information + (Client joining happens automatically between client and server.) + Running as server, waiting for Launch - ==>Ŭ¶óÀ̾ðÆ®´Â ½ÇÇàÁï½Ã µ¥ÀÌŸµéÀÌ Àü´ÞµÇ¹Ç·Î ´ë±â»óÅ°¡ ¾ø´Ù. + ==>Client has no waiting state as data is transferred immediately on startup. - ==>°¢°¢ÀÇ »óŸ¦ Á¤ÀÇÇÏ°í °¢ »óÅ¿¡ ¸Â´Â 󸮸¦ ÇØÁÖ¸é µÈ´Ù. + ==>Define each state and implement the appropriate handling for each. switch(state){ } */ @@ -1534,8 +1534,8 @@ void CCTCLManager::DoMech4Comm() } break; case 1: - //¼­¹ö/Ŭ¶óÀ̾ðÆ®·Î¼­ ½ÇÇàÁغñÇϵµ·Ï ¸í·ÉÀ» Àü´ÞÇÑ´Ù. - //¶ÇÇÑ ¼­¹ö¸¦ ½ÇÇàÇϴµ¥ ÇÊ¿äÇÑ ¸ðµç ÆĶó¹ÌÅ͵µ ÇÔ²² Àü´ÞÇÑ´Ù. + //Send command to prepare for execution as server/client. + //Also transmit all parameters required to run the server. for(i = 0; i < g_nPlayerInfos; i++) { SPlayerInfo& pi = g_aPlayerInfos[i]; if (!pi.m_bBot) { @@ -1562,12 +1562,12 @@ void CCTCLManager::DoMech4Comm() } } if (i == g_nPlayerInfos) { - // Botµé¿¡ ´ëÇÑ Á¤º¸¸¦ ¸ðµÎ Çѵ¥ ¹­¾î¼­ º¸³½´Ù. + // Bundle and send all Bot information together. CPacket pak(&SVR.GetGameSOC()); pak.Assemble("B", C_BOTS); for(i = 0; i < g_nPlayerInfos; i++) { - if (i != g_nServer) { // ¿ø·¡ Bot¸¸ Áö±ÝÀº ¼­¹ö¸¦ Á¦¿ÜÇÑ ÀüºÎ... + if (i != g_nServer) { // Originally bots only; now everyone except the server... SPlayerInfo& pi = g_aPlayerInfos[i]; pak.Assemble("BnsDWwsnn", pi.m_bBot, pi.m_nLevelOrTesla, pi.m_szName, pi.m_nMechIndex, pi.m_fileID, pi.m_recordID, pi.m_szMech, pi.m_nTeamOrSkin, pi.m_nDecal); } @@ -1578,10 +1578,10 @@ void CCTCLManager::DoMech4Comm() } break; case 4: - // °ÔÀÓÀÌ ¼º°øÀûÀ¸·Î ¸¸µé¾îÁö¸é ¼­¹ö¿Í Ŭ¶óÀ̾ðÆ®µéÀÇ Mech¿¡ ´ëÇÑ Á¤º¸µéÀ» SetÇÑ´Ù... + // Once the game is successfully created, set Mech info for server and all clients... if (SOCGame.m_nGameReturn == _EGR_OkCreateSession) { for(i = 0; i < g_nPlayerInfos; i++) { - if (i != g_nServer) { // ¼­¹ö´Â ÀÌ¹Ì SetMech¿¡ ÁøÀÔÇÑ »óÅÂ... + if (i != g_nServer) { // Server has already entered SetMech... SPlayerInfo& pi = g_aPlayerInfos[i]; if (!pi.m_bBot) { CTeslaInfo& ti = m_aTIs.GetAt(pi.m_nLevelOrTesla); @@ -1594,8 +1594,8 @@ void CCTCLManager::DoMech4Comm() } break; case 6: - //¸ðµç Ŭ¶óÀ̾ðµåµéÀÌ ¼­¹ö¿¡ Âü¿©Çϱ⸦ ±â´Ù¸°´Ù.<==ÀÌ ÀÀ´äÀº ¼­¹ö·Î ºÎÅÍ ¾òÀ» ¼ö ÀÖ´Ù. - //Âü¿©°¡ ¸ðµÎ ³¡³µÀ¸¸é, ¼­¹ö·Î ÇÏ¿©±Ý °ÔÀÓÀ» Launch½ÃÅ°µµ·Ï ÇÑ´Ù. + //Wait for all clients to join the server. <==This response comes from the server. + //Once all clients have joined, instruct the server to Launch the game. if (SOCGame.m_nGameReturn == _EGR_OkLaunchReady) { g_nMech4Comm = 9; } diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/ctcl.h b/Gameleap/code/mw4/Code/MW4GameEd2/ctcl.h index 41515b53..080fbea1 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/ctcl.h +++ b/Gameleap/code/mw4/Code/MW4GameEd2/ctcl.h @@ -42,7 +42,7 @@ public: const char* m_pcsz; int m_nLauncherConnection; // 0: no connection, +1: connection, -1: connecting - int m_nConnection2; // m_bCameraShip°ª¿¡ µû¶ó °ÔÀÓ È¤Àº Ä«¸Þ¶ó ½±°úÀÇ Á¢¼ÓÀ» ÀǹÌ, 0: no connection, +1: connection, -1: connecting + int m_nConnection2; // Connection to game or camera ship per m_bCameraShip, 0: no connection, +1: connected, -1: connecting int m_nApplType; int m_nApplState; int m_nGameState; diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/ctime.cpp b/Gameleap/code/mw4/Code/MW4GameEd2/ctime.cpp index 89317a07..60c547c4 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/ctime.cpp +++ b/Gameleap/code/mw4/Code/MW4GameEd2/ctime.cpp @@ -44,7 +44,7 @@ int GetDayEnd(int nYear, int nMonth) long GetTotalSeconds(int nYear, int nMonth, int nDay) { - // nYear, nMonth, nDay³¯ÀÇ 0½Ã 0ºÐ 0Ãʸ¦ 0À¸·Î ÇÑ ÃÊ´ÜÀ§ ¼ö... + // Seconds elapsed since 00:00:00 on the date nYear/nMonth/nDay... ASSERT(nYear >= 1970); ASSERT((1 <= nMonth) && (nMonth <= 12)); ASSERT(1 <= nDay); @@ -57,13 +57,13 @@ long GetTotalSeconds(int nYear, int nMonth, int nDay) if (IsLeapYear(nStart)) { nDays++; } - lTotal += nDays * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += nDays * 24 * 60 * 60; // 24 hours * 60 min * 60 sec } for(nStart = 1; nStart < nMonth; nStart++) { int nDayEnd = GetDayEnd(nYear, nStart); - lTotal += nDayEnd * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += nDayEnd * 24 * 60 * 60; // 24 hours * 60 min * 60 sec } - lTotal += (nDay - 1) * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += (nDay - 1) * 24 * 60 * 60; // 24 hours * 60 min * 60 sec return lTotal; } diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/ctime.h b/Gameleap/code/mw4/Code/MW4GameEd2/ctime.h index 835eb000..eb787ad3 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/ctime.h +++ b/Gameleap/code/mw4/Code/MW4GameEd2/ctime.h @@ -16,7 +16,7 @@ class CTimeDate public: union { struct { - // Bit Field´Â ¾ÕÂÊ¿¡ ÁöÁ¤µÈ °ÍÀÌ LowBitÀÌ´Ù. + // Bit Fields declared first are at the low-bit end. DWORD m_xDay: 5; // 2^0, 2^5-1 DWORD m_xMonth: 4; // 2^5, 2^4-1 DWORD m_xYear: TIMEDATE_YEAR_BITS; // from 1900-2155 // 2^9, 2^8-1 diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/mugSocs.cpp b/Gameleap/code/mw4/Code/MW4GameEd2/mugSocs.cpp index 4488c3cf..55e830ca 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/mugSocs.cpp +++ b/Gameleap/code/mw4/Code/MW4GameEd2/mugSocs.cpp @@ -1375,7 +1375,7 @@ void CSockAddr::SetTarget(const char* pcszAddr) { if (pcszAddr) { sin_addr.s_addr = inet_addr(pcszAddr); - if (sin_addr.s_addr == INADDR_ANY) { // 0.0.0.0À̱⠶§¹®¿¡ HOST/Network Addr¹«°ü + if (sin_addr.s_addr == INADDR_ANY) { // 0.0.0.0, HOST/Network Addr irrelevant hostent* pHN = gethostbyname(pcszAddr); if (pHN) { sin_addr.s_addr = *(u_long*)pHN->h_addr; @@ -3667,7 +3667,7 @@ CSOCListen* CSOCManager::DoListen(int nPort, PFN_CreateSOCClient pfnCSC, DWORD d pSOCListen = new CSOCListen(nPort); pSOCListen->SetCSCParam(pfnCSC, dwCSCParam1, dwCSCParam2); if (!DoListen(pSOCListen, nPort)) { - // °°Àº Æ÷Æ®¸¦ 2¹ø Listen ÇÏ´Â °æ¿ì?... + // Case of Listen on the same port twice?... pSOCListen = NULL; } diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/mugsocs.h b/Gameleap/code/mw4/Code/MW4GameEd2/mugsocs.h index e0495c0a..4df009db 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/mugsocs.h +++ b/Gameleap/code/mw4/Code/MW4GameEd2/mugsocs.h @@ -41,7 +41,7 @@ extern char SERVERID[]; #endif // !MAX_PACKET #ifndef MAX_FTPBUF #define MAX_FTPBUF 1024 -// MAX_FTPBUF´Â MAX_PACKETº¸´Ù ¹Ýµå½Ã ÀÛ¾Æ¾ß ÇÑ´Ù? +// MAX_FTPBUF must be smaller than MAX_PACKET? // 9+size==sizeof(bCmd) + sizeof(FTID) + sizeof(size) + size #endif // !MAX_FTPBUF @@ -251,7 +251,7 @@ private: #define ESTRF_USER_START 100 -#define ESTRF_PASSWORDCHANGED 110 // ·Î±×ÀÎÇÏ°í ÀÖ´Â µ¿¾È¿¡ Æнº¿öµå°¡ ¹Ù²ñ +#define ESTRF_PASSWORDCHANGED 110 // Password changed while logged in void Randomize(); @@ -268,7 +268,7 @@ union UPacketValue class CDAPacket : public SOCBase_Class { -// PacketÀÇ ¾Õ ºÎºÐÀ» ó¸®ÇÏ°í ³­ µÞ ºÎºÐÀÇ °¡º¯ ÆĶó¹ÌÅÍ... +// Variable parameters in the tail portion after processing the packet header... public: BYTE m_bCmd; BYTE m_bReserved; @@ -361,8 +361,8 @@ public: #define C_ROOM_MAKE 232 // s - name, s - password #define C_ROOM_JOIN 233 -// d - number(RoomÀ» ¶°³ª´Â °ÍÀº -1), s - password -#define S_ROOM_JOIN 233 // C_ROOM_MAKE/C_ROOM_JOINÀÇ °á°ú... +// d - number (leaving a Room = -1), s - password +#define S_ROOM_JOIN 233 // Result of C_ROOM_MAKE/C_ROOM_JOIN... // b - code(CSCODE_OK or error code), d - number #define C_ROOM_UPDS 234 // CSCODE_... + @ @@ -384,13 +384,13 @@ public: #define S_FTP 254 //... see ftp.txt #define X_KEEPALIVE 255 // no parameters, should be ignored... -#define TX_SYSTEM 0 // ½Ã½ºÅÛ ¸Þ½ÃÁö... -#define TX_NORMAL 1 // ÀÏ¹Ý Ã¤Æà ÅؽºÆ® -#define TX_WARNING 2 // °æ°í -#define TX_ERROR 3 // ¿À·ù -#define TX_FATAL 4 // Ä¡¸íÀûÀÎ ¿À·ù -#define TX_INFO 5 // »ç¿ëÀÚ Á¤º¸ µîÀÇ Information Result... -#define TX_SAY 6 // ±Ó¼Ó¸» +#define TX_SYSTEM 0 // System message... +#define TX_NORMAL 1 // Regular chat text +#define TX_WARNING 2 // Warning +#define TX_ERROR 3 // Error +#define TX_FATAL 4 // Fatal error +#define TX_INFO 5 // Information result (e.g. user info)... +#define TX_SAY 6 // Whisper #define TX_LOCAL 7 // local echo.... #define TX_UNKNOWN 0xffff // unknown... @@ -493,7 +493,7 @@ CPacket protected: CSOC* m_pSOC; private: - // ÀÌ ¾ÈÀÇ ºí·°Àº ¹Ýµå½Ã ¿¬¼ÓÇØ¾ß ÇÑ´Ù... + // The block within must be contiguous... WORD m_wLen; BYTE m_ba[MAX_PACKET]; // @@ -587,7 +587,7 @@ end of variable PACKET_MAP definitions... class CFileTransfer : public TDBLNK(CFileTransfer*) { public: - // ¼­¹ö·Î ºÎÅÍ ¹ÞÀº Á¤º¸... - ȤÀº Ŭ¶óÀ̾ðÆ®¿¡°Ô ÀüÇØÁÙ Á¤º¸... + // Information received from server... - or information to relay to client... BOOL m_bClientSite; DWORD m_dwFTID; DWORD m_dwGUARD; @@ -680,18 +680,18 @@ protected: // time out to Drop... DWORD m_dwKARcvTimeOut; #ifdef WIN32 - // º¸Åë Login°úÁ¤¿¡ ¾²ÀÌ´Â À©µµ¿ì ÇÚµé + // Window handle typically used during Login process HWND m_hWndOwner; #endif // WIN32 - // º¸Åë ±Û·Î¹ú º¯¼ö·Î ¾²ÀÌ´Â ¼ÒÄÏÆ÷ÀÎÅÍ¿¡ ´ëÇÑ ÀÚµ¿ NULL AssignÀ» À§ÇÏ¿© + // For auto NULL assignment of socket pointer typically used as a global variable PSOC* m_ppSOC; - // ¼ÒÄÏÀ» ±¸ºÐÇϱâ À§ÇÏ¿© »ç¿ëÀÚ ÇÁ·Î±×·¥¿¡¼­ ¾²ÀÌ´Â ¾ÆÀ̵ð - // ÁÖ·Î ¼­¹öÀÇ °æ¿ì¿¡´Â Ŭ¶óÀ̾ðÆ®°¡ Á¢¼ÓÇÒ ¶§¸¶´Ù °íÀ¯ ¾ÆÀ̵𸦠ºÎ¿©ÇÏ¿© »ç¿ë - // ÇϳªÀÇ Client°¡ ´Ù¼öÀÇ ¼­¹ö¿¡ Á¢¼ÓÇÒ ¶§(ÁÖ·Î StarÇü) °¢°¢ÀÇ Á¢¼ÓÀ» ±¸ºÐÇÒ ¶§ »ç¿ë - // Ŭ¶óÀ̾ðÆ®°¡ ÇϳªÀÇ ¼­¹ö¿¡¸¸ Á¢¼ÓÇÏ´Â °æ¿ì Ŭ¶óÀ̾ðÆ®°¡ ¼­¹ö¿¡ Á¢¼Ó ÁßÀÎÁö ȤÀº Á¢¼ÓÇß´ÂÁö¸¦ ÆÇ´ÜÇÒ ¶§ - // CSOCManager::FindSOC(CSOC_SERVER_ID==default)->GetConnectionState()¸¦ »ç¿ë. - // limits.h¸¦ includeÇؾßÇÔ. - // CSOC»ý¼º½ÃÀÇ ±âº»°ª: CSOCServer == CSOC_SERVER_ID(=INT_MIN), CSOCClient == CSOC_CLIENT_ID(=0), CSOCListen == CSOC_LISTEN_ID(=-1) + // ID used in user program to identify a socket + // Mainly for servers: assigns a unique ID each time a client connects + // Used to distinguish each connection when a client connects to multiple servers (Star topology) + // When a client connects to only one server: used to check if client is connecting or already connected + // Use CSOCManager::FindSOC(CSOC_SERVER_ID==default)->GetConnectionState(). + // Must include limits.h. + // Default values at CSOC creation: CSOCServer==CSOC_SERVER_ID(INT_MIN), CSOCClient==CSOC_CLIENT_ID(0), CSOCListen==CSOC_LISTEN_ID(-1) union { int m_nID; UINT m_uID; @@ -725,8 +725,8 @@ protected: DWORD m_xGracefulRemote: 1; DWORD m_xAbortyLocal: 1; DWORD m_xAbortyRemote: 1; - DWORD m_xLoginStarted: 1; // »ç¿ëÀÚ°¡ Á÷Á¢ °ªÀ» SettingÇØ¾ß ÇÑ´Ù. - DWORD m_xLoginOK: 1; // »ç¿ëÀÚ°¡ Á÷Á¢ °ªÀ» SettingÇØ¾ß ÇÑ´Ù. + DWORD m_xLoginStarted: 1; // Must be set directly by the caller. + DWORD m_xLoginOK: 1; // Must be set directly by the caller. } m_DW; DWORD m_dwVarFlags; }; diff --git a/Gameleap/code/mw4/Code/MW4GameEd2/nonmfc.h b/Gameleap/code/mw4/Code/MW4GameEd2/nonmfc.h index 0802a8a3..cfbf5f2a 100644 --- a/Gameleap/code/mw4/Code/MW4GameEd2/nonmfc.h +++ b/Gameleap/code/mw4/Code/MW4GameEd2/nonmfc.h @@ -6,7 +6,7 @@ inline BOOL AssertDialog(const char* pcszExpr, const char* pcszfile, int nLine) { char szBuf[MAX_PATH * 2]; - sprintf(szBuf, "\"%s\" ÆÄÀÏÀÇ %dÁÙ¿¡¼­ ASSERT!!!\n\nµð¹ö±ëÀ» ÇϽðڽÀ´Ï±î?", pcszfile, nLine); + sprintf(szBuf, "ASSERT!!! in \"%s\" at line %d\n\nDo you want to debug?", pcszfile, nLine); #ifdef WIN32 return ::MessageBox(NULL, szBuf, pcszExpr, MB_YESNO) == IDYES; diff --git a/Gameleap/code/mw4/Code/mw4print/Cstr.cpp b/Gameleap/code/mw4/Code/mw4print/Cstr.cpp index 78a8b128..cabf94a1 100644 --- a/Gameleap/code/mw4/Code/mw4print/Cstr.cpp +++ b/Gameleap/code/mw4/Code/mw4print/Cstr.cpp @@ -1077,7 +1077,7 @@ int CStrArray::GetTotalLength() const int nTotalLength; int i, nSize = GetSize(); - nTotalLength = nSize; // nSize°³ÀÇ '\0' + nTotalLength = nSize; // nSize null terminators '\0' for(i = 0; i < nSize; i++) { nTotalLength += strlen(GetAt(i)); } diff --git a/Gameleap/code/mw4/Code/mw4print/cspcfd.cpp b/Gameleap/code/mw4/Code/mw4print/cspcfd.cpp index 389f154f..23c42e4a 100644 --- a/Gameleap/code/mw4/Code/mw4print/cspcfd.cpp +++ b/Gameleap/code/mw4/Code/mw4print/cspcfd.cpp @@ -80,7 +80,7 @@ void CSpcFileDialog::SetCustomFilter(const char* pcszName/* = NULL*/, const char m_ofn.lpstrCustomFilter = p; if (!pcszName) { - pcszName = "»ç¿ëÀÚ Á¤ÀÇ ÆÄÀÏ"; + pcszName = "User-defined file"; } strcpy(p, pcszName); p = &p[strlen(pcszName)]; @@ -111,7 +111,7 @@ BOOL CSpcFileDialog::DoMessage(HWND hParent, UINT uMsg, WPARAM wParam, LPARAM lP switch(uMsg) { case WM_INITDIALOG: if (m_dwStyle) { - //0x480 // ÆÄÀÏ À̸§ Edit + //0x480 // File Name Edit HWND hReadOnly = ::GetDlgItem(hParent, 0x0410); // Read Only if (hReadOnly) { if (m_dwStyle == (DWORD)(-1)) { diff --git a/Gameleap/code/mw4/Code/mw4print/cspcfd.h b/Gameleap/code/mw4/Code/mw4print/cspcfd.h index 5ff80587..6f4d0439 100644 --- a/Gameleap/code/mw4/Code/mw4print/cspcfd.h +++ b/Gameleap/code/mw4/Code/mw4print/cspcfd.h @@ -21,8 +21,8 @@ public: CSpcFileDialog(BOOL bOpenFileDialog, LPCTSTR lpszDefExt = NULL, LPCTSTR lpszFileName = NULL, DWORD dwFlags = OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, LPCTSTR lpszFilter = NULL, CWnd* pParentWnd = NULL); void SetTitle(const char* pcszTitle); void SetWorkingDir(const char* pcszWorkingDir); - void SetFilterIndex(int nFilterIndex); // 1 ±âÁØÇÑ °ª, 0Àº »ç¿ëÀÚ ÇÊÅÍ - int GetFilterIndex() const; // 1 ±âÁØÇÑ °ª, 0Àº »ç¿ëÀÚ ÇÊÅÍ + void SetFilterIndex(int nFilterIndex); // 1-based index, 0 = user-defined filter + int GetFilterIndex() const; // 1-based index, 0 = user-defined filter void SetCustomFilter(const char* pcszName = NULL, const char* pcszExt = NULL); void EnableHook(const char* pcszWindowText, DWORD dwStyle = (DWORD)(-1)); diff --git a/Gameleap/code/mw4/Code/mw4print/recscore.cpp b/Gameleap/code/mw4/Code/mw4print/recscore.cpp index 4a0a4d98..24ad0a2b 100644 --- a/Gameleap/code/mw4/Code/mw4print/recscore.cpp +++ b/Gameleap/code/mw4/Code/mw4print/recscore.cpp @@ -1008,27 +1008,27 @@ const char* ArmorZoneStr(int nArmorZone) case Adept::DamageObject::NullArmorZone: return "()"; case Adept::DamageObject::LeftLegArmorZone: - return "¿Þ¹ß"; + return "Left Leg"; case Adept::DamageObject::RightLegArmorZone: - return "¿À¸¥¹ß"; + return "Right Leg"; case Adept::DamageObject::LeftArmArmorZone: - return "¿ÞÆÈ"; + return "Left Arm"; case Adept::DamageObject::RightArmArmorZone: - return "¿À¸¥ÆÈ"; + return "Right Arm"; case Adept::DamageObject::RightTorsoArmorZone: - return "¿ìÃø"; + return "Right Torso"; case Adept::DamageObject::LeftTorsoArmorZone: - return "ÁÂÃø"; + return "Left Torso"; case Adept::DamageObject::CenterTorsoArmorZone: - return "Àü¸é"; + return "Front"; case Adept::DamageObject::CenterRearTorsoArmorZone: - return "Èĸé"; + return "Rear"; case Adept::DamageObject::HeadArmorZone: - return "¸Ó¸®"; + return "Head"; case Adept::DamageObject::SpecialArmorZone1: - return "º¸Á¶ÀåÄ¡1"; + return "Aux Device 1"; case Adept::DamageObject::SpecialArmorZone2: - return "º¸Á¶ÀåÄ¡2"; + return "Aux Device 2"; case Adept::DamageObject::DefaultArmorZone: return "Default"; } @@ -1996,83 +1996,83 @@ public: static SMSGFMT s_aKill[20][2] = { { { "%s's %s destroys %s's %s!", 0 }, // ok! - { "%sÀÇ %s, %sÀÇ %sÀ»(¸¦) Æı«ÇÏ´Ù!", 0 }, // ok! + { "%s's %s destroyed %s's %s!", 0 }, // ok! }, { { "%s's %s explodes in a fire-ball, thanks to %s.", 1 }, // ok! - { "%sÀÇ %s, °¢ ±â°üºÎÀÇ È­¿°À¸·Î Æø¹ß! %sÀÇ Àý¹¦ÇÑ °ø°Ý¼º°ø!", 1 }, // ok! + { "%s's %s explodes in flames! %s lands a perfect hit!", 1 }, // ok! }, { { "%s delivers the last blow as %s's %s explodes in flames!", 2 }, // ok! - { "%s´Â %sÀÇ %s¿¡!", 2 - 100}, // ok! + { "%s took a hit to %s's %s!", 2 - 100}, // ok! }, { { "Smoking wreckage is all that's left of %s's %s after %s delivers the fatal blow!", 1 }, - { "%sÀÇ ¹«ÀÚºñÇÑ °ø°ÝÀ¸·Î %sÀÇ %s ºÒŸ´Â ÀÜÇظ¸ ³²±æ °ÍÀÌ´Ù.", 2 }, // ok! + { "%s's merciless assault leaves only burning wreckage of %s's %s.", 2 }, // ok! }, { { "Glorious victory goes to %s as the wreckage from %s's %s lies burning on the battlefield!", 2 }, - { "ÀüȲÀº ±Þ¼Óµµ·Î ÁøÀü, %sÀÇ »ýÁ¸°¡´É¼ºÀº 0%%!", 8 }, // ok! + { "The battle escalates rapidly - %s's survival probability is 0%%!", 8 }, // ok! }, { { "%s's %s is put out of it's misery by a devastating shot from %s.", 1 }, - { "%sÀÇ ¾ÐµµÀûÀÎ È­·Â ¾Õ¿¡ %s óÂüÈ÷ ¹«³ÊÁö°í ÀÖ´Ù.", 4 }, // ok! + { "Under %s's overwhelming firepower, %s crumbles miserably.", 4 }, // ok! }, { { "%s racks up another kill marker from reducing %s's %s to rubble!", 2 }, - { "%s %sÀÇ %sÀ»(¸¦) ¶§·Á ´¯È÷°í, »õ·Î¿î ų¸¶Å©¸¦ ¾ò¾ú´Ù.", 2 }, // ok! + { "%s knocked out %s's %s and earned a new kill mark.", 2 }, // ok! }, { { "Fresh paint is applied to %s's %s to mark the destruction of %s's %s!", 0 }, // ok! - { "%s´Â %s¸¦ °ÝÃßÇÑ Å³¸¶Å©¸¦ %s¿¡ Ãß°¡Çß´Ù.", 0 - 100 }, + { "%s added a kill mark on %s for shooting down %s.", 0 - 100 }, }, { { "The burning wreckage of %s's %s is a reminder to all of the prowess of %s's battle skills!", 1 }, - { "%sÀÇ ÀÜÇØ´Â %sÀÌ(°¡) °¡Á®°¥ ½Â¸®ÀÇ ±â³äÇ°ÀÌ µÉ°ÍÀÌ´Ù.", 7 }, // ok! + { "The wreckage of %s will be %s's trophy of victory.", 7 }, // ok! }, { { "The thunderous explosion of %s's %s is music to the ears of %s!", 1 }, - { "%sÀÇ ±Í¿¡ µé·Á¿À´Â Á×À½ÀÇ ÀüÁÖ°î. ÁöÈÖÀÚ´Â %s.", 7 }, // ok! + { "A death prelude echoes in %s's ears. The conductor: %s.", 7 }, // ok! }, { { "%s's %s is destroyed by %s's %s.", 3 }, - { "%s'ÀÇ %s, %sÀÇ %s¿¡°Ô Æı«µÇ¾ú´Ù.", 3 }, // ok! + { "%s's %s was destroyed by %s's %s.", 3 }, // ok! }, { { "%s brings the four horsemen of the apocalypse down upon %s.", 4 }, - { "%s(ÀÌ)°¡ Èֵθ£´Â ½ÉÆÇÀÇ Ãß°¡ %s¿¡°Ô ÀÛ·ÄÇß´Ù.", 4 }, // ok! + { "The pendulum of judgment swung by %s strikes %s.", 4 }, // ok! }, { { "%s's life flashes as %s reduces the %s to a burning wreck.", 5 }, - { "%sÀÇ ¸¶Áö¸· »ý¸íÁÙ¿¡, %s !", 7 - 100 }, // ok! + { "On %s's last lifeline, %s!", 7 - 100 }, // ok! }, { { "%s is deafened by the resounding roar of the exploding %s, thanks to %s.", 1 }, - { "%s ±âüÀÇ Æø¹ß¼Ò¸®¿Í ÇÔ²², Àú Çϴ÷Π³¯¾Æ°¬´Ù. %s¿¡°Ô ¿µ±¤À»!", 7 }, // ok! + { "%s's mech explodes skyward. Glory to %s!", 7 }, // ok! }, { { "A kill marker is placed on %s's %s to mark the victory over %s.", 6 }, - { "%sÀÇ %s¿¡ »õ·Î¿î ų¸¶Å©¸¦ Ãß°¡ÇØ¾ß ÇÒ µí, Èñ»ýÀÚ´Â %s", 6 }, // ok! + { "A new kill mark should be added to %s's %s, victim: %s", 6 }, // ok! }, { { "%s is delivered unto the inferno with regards from %s.", 7 }, - { "%s, %sÀÇ È£À§ÇÏ¿¡ Áö¿ÁÀ¸·Î ÇâÇß´Ù. %s¿¡°Ô ¸íº¹À»!", 9 }, // ok! + { "%s headed to hell under %s's escort. Rest in peace, %s!", 9 }, // ok! }, { { "Another kill marker is given up by %s, as %s celebrates victory.", 7 }, - { "%s, %sÀÇ »õ·Î¿î ų ¸¶Å©°¡ µÇ¾ú´Ù. ¿µ¿øÇÑ ¾È½ÄÀ»¡¦", 7 - 100 }, + { "%s became %s's new kill mark. Rest in peace...", 7 - 100 }, }, { { "Best wishes in the afterlife are presented to %s from %s.", 7 }, - { "%s¿¡°Ô ³²Àº °ÍÀº ¿ÀÁ÷ %s¿¡ ´ëÇÑ º¹¼ö»Ó!", 7 }, // ok! + { "All that remains for %s is revenge against %s!", 7 }, // ok! }, { { "Tragedy strikes %s as %s guns the %s down.", 5 }, - { "%s ¸ðµç È­·ÂÀ» µ¿¿øÇØ %sÀÇ %sÀ»(¸¦) Æı«Çß´Ù.", 2 }, // ok! + { "%s brought all firepower to bear and destroyed %s's %s.", 2 }, // ok! }, { { "%s earns the revenge of %s after the tragic destruction of the %s.", 2 }, - { "%sÀÇ ºñ±ØÀûÀÎ ÃÖÈÄ! %s Àý¸ÁÇÏ´Â %sÀ»(¸¦) ÁöÄѺ¼ »ÓÀÌ´Ù.", 9 }, // ok! + { "A tragic end for %s! %s can only watch %s in despair.", 9 }, // ok! }, }; @@ -2083,11 +2083,11 @@ static SMSGFMT s_aKill[20][2] = { static SMSGFMT s_aSuicide[2][2] = { { { "%s leaves the battlefield in disgrace after causing the destruction of the %s.", 0 }, - { "%s ÀÚÆø! %s ºÒ¸í¿¹½º·´°Ô ÀüÀåÀ» ¶°³µ´Ù!", 2 }, + { "%s self-destructed! %s left the battlefield in disgrace!", 2 }, }, { { "%s will not grace the halls of the honored mechwarriors after self-destructing the %s.", 0 }, - { "%s ÀÚÆø! ºñ°ÌÀÚ¿©, Áø½Ç·Î ½Â¸®¸¦ ¿øÇϴ°¡?", 3 }, + { "%s self-destructed! Coward, do you truly desire victory?", 3 }, }, }; @@ -2112,43 +2112,43 @@ static SMSGFMT s_aSuicide[2][2] = { static SMSGFMT s_aShot[10][2] = { { { "%s's %s fires the %s and damages the %s of %s's %s.", 0 }, - { "%s %sÀÇ %s¿¡ %sÀ¸·Î °ø°ÝÇß´Ù", 1 }, // ok! + { "%s attacked %s's %s with %s", 1 }, // ok! }, { { "%s fires the %s's %s and decimates the %s of %s's %s.", 2 }, - { "%sÀÌ(°¡) ž½ÂÇÑ %s, %s·Î %sÀÌ(°¡) ž½ÂÇÑ %sÀÇ %s¿¡ ÇÇÇظ¦ ÀÔÇû´Ù.", 2 }, + { "%s piloting %s damaged %s's %s on %s's %s.", 2 }, }, { { "%s's %s takes a devastating hit in the %s from %s.", 3 }, - { "%sÀÇ %s, %sÀÇ ¾ÐµµÀûÀÎ °ø°Ý¿¡ %s¿¡ ÇÇÇظ¦ ÀÔ¾ú´Ù.", 4 }, // ok! + { "%s's %s took damage to the %s under %s's overwhelming attack.", 4 }, // ok! }, { { "%s's %s suffers a direct hit to it's %s from %s's %s.", 5 }, - { "%sÀÇ %sÀº(´Â) %sÀÇ %s¿¡ Á÷Á¢ÀûÀÎ ÇÇÇظ¦ ¹Þ¾Ò´Ù. ÇÇÇØ %s!", 6 -100}, + { "%s's %s took direct damage from %s's %s. Damage: %s!", 6 -100}, }, { { "%s damages %s's %s.", 7 }, - { "%s, %sÀÇ %s¿¡ ÇÇÇظ¦ ÀÔÇû´Ù..", 7 }, // ok! + { "%s dealt damage to %s's %s..", 7 }, // ok! }, { { "Dense black smoke pours from %s's %s as a result of %s's targeted hit.", 8 }, - { "%sÀÇ Àý¹¦ÇÑ °ø°ÝÀ¸·Î %sÀÇ %s¿¡¼­ °ËÀº ¿¬±â°¡ ÆÛÁö°í ÀÖ´Ù.", 7 }, // ok! + { "Black smoke billows from %s's %s from %s's precise attack.", 7 }, // ok! }, { { "Fire boils from the damaged %s of %s's %s after %s hits it with a %s.", 9 }, - { "%s %sÀ»(¸¦) ¹ß»çÇÏ¿©, %sÀÌ(°¡) ž½ÂÇÑ %sÀÇ %s¿¡ ÇÇÇظ¦ ¹ß»ý½ÃÄ×´Ù.", 10 }, // ok! + { "%s fired %s, dealing damage to the %s of %s's %s.", 10 }, // ok! }, { { "Smoke and fire are trailing from %s's %s, all results of the %s blast inflicted by %s.", 11 }, - { "%sÀÇ %s °ø°Ý¿¡, ºÒ°ú ¿¬±â°¡ %sÀÇ ±âü¸¦ µÚµ¤°í ÀÖ´Ù.", 15 }, // ok! + { "Fire and smoke engulf %s's mech from %s's %s attack.", 15 }, // ok! }, { { "%s targets and fires the %s; %s cries in dismay as the %s's %s is damaged.", 10 }, - { "%s %sÀ»(¸¦) Á¶ÁØÇÏ¿© %sÀÌ(°¡) ž½ÂÇÑ %sÀÇ %s¿¡ ¸ÂÃá ÈÄ ¹æ¾Æ¼è¸¦ ´ç°å´Ù.", 10 }, // ok! + { "%s aimed %s and pulled the trigger, hitting the %s of %s's %s.", 10 }, // ok! }, { { "%s takes a severe wound to the %s as %s aims for the %s again.", 13 }, - { "%s ´Ù½Ã %sÀÇ %sÀ»(¸¦) Á¶ÁØÇÏ¿© »ç°ÝÇß´Ù. %s, %s¿¡ ½É°¢ÇÑ ÇÇÇظ¦ ÀÔÀº µí.", 14 -100}, + { "%s aimed again at %s's %s and fired. %s seems to have taken serious damage to %s.", 14 -100}, }, }; @@ -2156,19 +2156,19 @@ static SMSGFMT s_aShot[10][2] = { static SMSGFMT s_aCTF[1][2] = { { { "%s captured flag.", 0 }, - { "%s, ±ê¹ß ȹµæ!.", 0 }, + { "%s captured the flag!", 0 }, }, }; static SMSGFMT s_aFBK[1][2] = { { { "%s destroyed friendly building.", 0 }, - { "%s, ±ê¹ß ȹµæ!.", 0 }, + { "%s captured the flag!", 0 }, }, }; static SMSGFMT s_aEBK[1][2] = { { { "%s destroyed enemy building.", 0 }, - { "%s, ±ê¹ß ȹµæ!.", 0 }, + { "%s captured the flag!", 0 }, }, }; const SMSGFMT* pcFMT; diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/IDataChannel.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/IDataChannel.h index 09167e09..ed4ba9d1 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/IDataChannel.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/IDataChannel.h @@ -28,7 +28,7 @@ // forward declaration class FPInterface; -//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +//---------------------------------------------------------------------- // A data channel is a homogeneous collection of objects of a user defined // type (data objects). Data channels are uniquely identified by a Class_ID. // @@ -52,7 +52,7 @@ class IDataChannel : public InterfaceServer #define DATACHANNEL_INTERFACE Interface_ID(0x38a718a8, 0x14685b4b) #define GetDataChannelInterface(obj) ((IDataChannel*)obj->GetInterface(DATACHANNEL_INTERFACE)) -//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +//---------------------------------------------------------------------- // Face-data channel interface // // This is an abstraction of a collection of data objects that is @@ -149,7 +149,7 @@ class IFaceDataChannel : public IDataChannel #define FACEDATACHANNEL_INTERFACE Interface_ID(0x181358d5, 0x3cab1bc9) #define GetFaceDataChannelInterface(obj) ((IFaceDataChannel*)obj->GetInterface(FACEDATACHANNEL_INTERFACE)) -//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +//---------------------------------------------------------------------- // Interface class that allows to execute a callback method (Proc) for all // face-data channels of an object. // diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/IFaceDataMgr.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/IFaceDataMgr.h index c214b626..008aaeef 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/IFaceDataMgr.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/IFaceDataMgr.h @@ -21,7 +21,7 @@ // GUID that identifies this ifc (interface) #define FACEDATAMGR_INTERFACE Interface_ID(0x1b454148, 0x6a066927) -//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +//---------------------------------------------------------------------- // Interface for managing face-data channels. // Objects that want to have face-data channels should implement this ifc // diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/IFaceDataMgrImpl.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/IFaceDataMgrImpl.h index 2fb51205..00c5666d 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/IFaceDataMgrImpl.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/IFaceDataMgrImpl.h @@ -20,7 +20,7 @@ #include #include "export.h" -//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +//---------------------------------------------------------------------- // Face-data management implementation //________________________________________________________________________ class IFaceDataMgrImpl : public IFaceDataMgr diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/IPipelineClient.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/IPipelineClient.h index 6296d3c8..7f765076 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/IPipelineClient.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/IPipelineClient.h @@ -20,7 +20,7 @@ // GUID that identifies this ifc (interface) #define PIPELINECLIENT_INTERFACE Interface_ID(0x62383d51, 0x2d0f7d6a) -//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +//---------------------------------------------------------------------- // This interface should be implemented by objects that flow up the // geometry pipeline and have data members that belong to the pipeline // channels (geometry, topology, texmap, etc) diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/BitMaps.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/BitMaps.h index d7c02258..1e60ff73 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/BitMaps.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/BitMaps.h @@ -1,7 +1,7 @@ /* * BitMaps.h - MAX bitmap access classes * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/HashTab.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/HashTab.h index b27f6c34..402ea5b0 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/HashTab.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/HashTab.h @@ -1,7 +1,7 @@ /* * HashTable.h - HashTable class for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/IVisualMS.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/IVisualMS.h index 8826aeaa..3a202f67 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/IVisualMS.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/IVisualMS.h @@ -4,7 +4,7 @@ * IVisualMSMgr - core interface to the VisualMS manager * IVisualMSForm - interface to an existing form * - * Copyright © Autodesk, Inc, 2000. John Wainwright. + * Copyright © Autodesk, Inc, 2000. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXKeys.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXKeys.h index 4fe53588..368ab12b 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXKeys.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXKeys.h @@ -1,7 +1,7 @@ /* * MAXKeys.h - MAX controller keyframe access classes * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXMats.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXMats.h index bdc45cf9..8dd13f19 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXMats.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXMats.h @@ -1,7 +1,7 @@ /* * MAXMaterials.h - MAX material & map wrapper classes * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXNURBS.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXNURBS.h index 0209d800..2c262794 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXNURBS.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXNURBS.h @@ -1,7 +1,7 @@ /* * MAXNURBS.h - MAX NURBS access classes * - * Copyright © Autodesk, Inc. 1997 + * Copyright © Autodesk, Inc. 1997 * Author: John Wainwright * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXObj.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXObj.h index 16feaa44..739bb81f 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXObj.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAXObj.h @@ -1,7 +1,7 @@ /* * MAXObject.h - MAX object wrapper classes in MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAX_cmds.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAX_cmds.h index 77312d25..cafcb1a3 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAX_cmds.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MAX_cmds.h @@ -1,7 +1,7 @@ /* * MAX_commands.h - defines all the invocable MAX UI commands - for the 'max' scripter construct * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSCustAttrib.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSCustAttrib.h index f22e9b5c..ccdd1bc2 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSCustAttrib.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSCustAttrib.h @@ -1,7 +1,7 @@ /* * MSCustAttrib.h - MAXScript scriptable custom attributes MAX objects * - * Copyright © Autodesk, Inc, 2000. John Wainwright. + * Copyright © Autodesk, Inc, 2000. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSPlugIn.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSPlugIn.h index a982736b..054b9808 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSPlugIn.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSPlugIn.h @@ -39,7 +39,7 @@ * MSPluginClass instance from which info for the implementing * the standard ClassDesc2 interface is derived. * - * Copyright © Autodesk, Inc, 1998. John Wainwright. + * Copyright © Autodesk, Inc, 1998. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSZipPackage.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSZipPackage.h index 12489369..88ec8a56 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSZipPackage.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MSZipPackage.h @@ -1,7 +1,7 @@ /* * MSZipPackage.h - MAXScript Zip Package file classes & utilities * - * Copyright © Autodesk, Inc, 2000. John Wainwright. + * Copyright © Autodesk, Inc, 2000. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MXSCtrlr.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MXSCtrlr.h index 5f3d867b..43cd9be2 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MXSCtrlr.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MXSCtrlr.h @@ -1,7 +1,7 @@ /* * MSController.h - MAXScript scriptable controllers for MAX * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Maxclses.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Maxclses.h index 696544b0..c748af65 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Maxclses.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Maxclses.h @@ -1,7 +1,7 @@ /* * MAX_classes.h - class object for all the MAX built-in types * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MeshSub.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MeshSub.h index 333d7ff1..5f29f1a9 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MeshSub.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MeshSub.h @@ -6,7 +6,7 @@ * working with meshes. Also provides access to MNMesh tools and * mesh sub-objects as direct properties on nodes. * - * Copyright © Autodesk, Inc., 1998 + * Copyright © Autodesk, Inc., 1998 * John Wainwright */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MouseTool.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MouseTool.h index 44819724..3add15a6 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MouseTool.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/MouseTool.h @@ -1,7 +1,7 @@ /* * MouseTool.h - scriptable mouse CommandModes for MAX * - * Copyright © Autodesk, Inc, 1998. John Wainwright. + * Copyright © Autodesk, Inc, 1998. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Name.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Name.h index 8cd0d3c9..9fa81272 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Name.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Name.h @@ -1,7 +1,7 @@ /* * Name.h - Name class for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/NamedSet.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/NamedSet.h index 82fbcf45..604e4609 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/NamedSet.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/NamedSet.h @@ -2,7 +2,7 @@ * NamedSet.h - scripter access to named node selection sets * * John Wainwright - * Copyright © Autodesk, Inc. 1997 + * Copyright © Autodesk, Inc. 1997 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/NurbsSub.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/NurbsSub.h index 5a68215a..23015751 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/NurbsSub.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/NurbsSub.h @@ -3,7 +3,7 @@ * * mirrors the mesh sub-object selection classes for NURBS sub-objects. * - * Copyright © Autodesk, Inc., 1998 + * Copyright © Autodesk, Inc., 1998 * John Wainwright */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/OLE_auto.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/OLE_auto.h index 9ef141ab..547cdef9 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/OLE_auto.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/OLE_auto.h @@ -1,7 +1,7 @@ /* * OLEAutomation.h - OLE Automation services for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ObjSets.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ObjSets.h index c49c8cc0..c5a7e3ee 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ObjSets.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ObjSets.h @@ -1,7 +1,7 @@ /* * ObjectSets.h - ObjectSet classes for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Parser.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Parser.h index a7eaef32..5a764ec1 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Parser.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Parser.h @@ -1,7 +1,7 @@ /* * Parser.h - a compiler for the 3DS MAX MAXScript scripting language * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/PathName.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/PathName.h index 94c7e0f9..3e7b26a7 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/PathName.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/PathName.h @@ -1,7 +1,7 @@ /* * PathName.h - PathName class for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Pipe.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Pipe.h index 3ae49b7e..12610e77 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Pipe.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Pipe.h @@ -1,7 +1,7 @@ /* * Pipe.h - NT TCHAR Pipe wrapper for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Rollouts.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Rollouts.h index 32191bf9..28e2ec8f 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Rollouts.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Rollouts.h @@ -1,7 +1,7 @@ /* * Rollouts.h - Rollout panel classes & functions for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/SceneIO.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/SceneIO.h index 741ff824..597947f4 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/SceneIO.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/SceneIO.h @@ -1,7 +1,7 @@ /* * SceneIO.h - MAXScript-related scene file I/O (persistent globals, on-open script, etc.) * - * Copyright © Autodesk, Inc, 1998. John Wainwright. + * Copyright © Autodesk, Inc, 1998. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ScrpCtrl.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ScrpCtrl.h index d3eec998..66a066d2 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ScrpCtrl.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ScrpCtrl.h @@ -2,7 +2,7 @@ * ScrpCtrl.h - interface to scripter-based expression controllers * * John Wainwright - * Copyright © Autodesk, Inc. 1997 + * Copyright © Autodesk, Inc. 1997 */ #ifndef _H_SCRPTCTRL diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Streams.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Streams.h index 7f7b9e10..22644d70 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Streams.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Streams.h @@ -1,7 +1,7 @@ /* * Streams.h - stream family for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Strings.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Strings.h index c37fb00d..431038f2 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Strings.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/Strings.h @@ -1,7 +1,7 @@ /* * Strings.h - string family for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/WireCtrl.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/WireCtrl.h index 90205daf..14332cff 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/WireCtrl.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/WireCtrl.h @@ -2,7 +2,7 @@ * WireCtrl.h - interface to parameter-wiring controllers * * John Wainwright - * Copyright © Autodesk, Inc. 1999 + * Copyright © Autodesk, Inc. 1999 */ #ifndef _H_WIRETCTRL diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/arraypro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/arraypro.h index f9a689c1..b1127ff3 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/arraypro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/arraypro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/atmspro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/atmspro.h index cd2497ba..b1a454c0 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/atmspro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/atmspro.h @@ -1,7 +1,7 @@ /* * atmspro.h - def_generics for the operations on MAX atmosphere objects * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/biprops.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/biprops.h index 54c636da..4701105b 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/biprops.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/biprops.h @@ -1,7 +1,7 @@ /* * built_in_properties.h - known core property defs for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/bitmapro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/bitmapro.h index 56d1c70b..d803ad06 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/bitmapro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/bitmapro.h @@ -1,7 +1,7 @@ /* * bitmap_protocol.h - protocol for MAX bitmaps * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/classIDs.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/classIDs.h index d0ae71a1..822560a7 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/classIDs.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/classIDs.h @@ -1,7 +1,7 @@ /* * class_ids.h - OLE Automation class id defs for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/colorpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/colorpro.h index ca3c1365..6838237f 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/colorpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/colorpro.h @@ -5,7 +5,7 @@ * * * Author John Wainwright - * Copyright © Autodesk Inc., 1997 + * Copyright © Autodesk Inc., 1997 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/corename.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/corename.h index c52b3b43..15346863 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/corename.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/corename.h @@ -1,7 +1,7 @@ /* * core_names.h - def_names for all the name objects that the MAXScript substrate code uses * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/creatpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/creatpro.h index 8a16825b..4ae30efc 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/creatpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/creatpro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ctbmapro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ctbmapro.h index eeb9d9d8..5ccdc4cd 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ctbmapro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ctbmapro.h @@ -1,7 +1,7 @@ /* * ctbmpro.h - protocol for MAX camera tracker bitmaps * - * Copyright © Autodesk, Inc 1998, John Wainwright + * Copyright © Autodesk, Inc 1998, John Wainwright * */ //CTBitMap diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ctrlrpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ctrlrpro.h index 55fd5f6d..90881c5b 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ctrlrpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/ctrlrpro.h @@ -1,7 +1,7 @@ /* * MAX_controller_protocol.h - def_generics for the operations on MAX controller objects * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defabs21.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defabs21.h index cc47eb68..e04ab5b3 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defabs21.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defabs21.h @@ -4,7 +4,7 @@ * abstract def_ macros for MAX R2.1 * * John Wainwright - * Copyright © Autodesk, Inc. 1998 + * Copyright © Autodesk, Inc. 1998 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defabsfn.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defabsfn.h index f009856f..a80c48d0 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defabsfn.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defabsfn.h @@ -28,7 +28,7 @@ * represented by instances of the Primitive class and declared using * these same def macro headers & corresponding def_primitive macros. * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defextfn.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defextfn.h index 1fecad66..c7fe780a 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defextfn.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defextfn.h @@ -8,7 +8,7 @@ * see def_abstract_functions.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defimpfn.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defimpfn.h index e3b86bc4..596acd67 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defimpfn.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/defimpfn.h @@ -8,7 +8,7 @@ * see def_abstract_functionss.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/definsfn.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/definsfn.h index 81b28dad..08fb424e 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/definsfn.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/definsfn.h @@ -9,7 +9,7 @@ * see def_abstract_functions.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ /* def_generic macro for instantiation declarations */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/evalprms.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/evalprms.h index 62959e70..0870f2a1 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/evalprms.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/evalprms.h @@ -1,7 +1,7 @@ /* * eval_prims.h - evaluator primitive function defs for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/evalpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/evalpro.h index d270b56b..9a6f5515 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/evalpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/evalpro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/kernlpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/kernlpro.h index 0f7eab30..d67701f5 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/kernlpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/kernlpro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/mathpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/mathpro.h index d99c77e9..ff2b81b4 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/mathpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/mathpro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/matpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/matpro.h index 0087cdc4..5e5292cc 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/matpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/matpro.h @@ -2,7 +2,7 @@ * matrix_protocol.h - def_generics for matrix protocol * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/nodepro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/nodepro.h index 6feb1a6c..1a01dff9 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/nodepro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/nodepro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/nurbspro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/nurbspro.h index 7865f01f..67e99112 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/nurbspro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/nurbspro.h @@ -1,7 +1,7 @@ /* * nurbspro.h - MAX NURBS protocols * - * Copyright © Autodesk, Inc. 1997 + * Copyright © Autodesk, Inc. 1997 * Author: John Wainwright * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/objpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/objpro.h index 53ae31ab..bdfcfe76 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/objpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/objpro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/prims.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/prims.h index 5c8c3abf..a82ff4de 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/prims.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/prims.h @@ -1,7 +1,7 @@ /* * primitives.h - primitive function defs for MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/quatpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/quatpro.h index 7994d916..340ec164 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/quatpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/quatpro.h @@ -2,7 +2,7 @@ * quat_protocol.h - def_generics for quaternion protocol * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/streampr.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/streampr.h index b66bdbae..455337fb 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/streampr.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/streampr.h @@ -1,7 +1,7 @@ /* * stream_protocol.h - def_generics for Stream protocol * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 */ def_visible_generic(read_value, "readValue"); diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/strngpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/strngpro.h index 94c25b86..c7afec15 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/strngpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/strngpro.h @@ -1,7 +1,7 @@ /* * string_protocol.h - def_generics for the string protocol * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/texmapro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/texmapro.h index 1af7c687..0aa57793 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/texmapro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/texmapro.h @@ -1,7 +1,7 @@ /* * texture_map_protocol.h - def_generics for the operations on MAX texture maps * - * Copyright © John Wainwright 1997 + * Copyright © John Wainwright 1997 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/thrdlcls.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/thrdlcls.h index a324e189..0ff27c0a 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/thrdlcls.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/thrdlcls.h @@ -1,7 +1,7 @@ /* * thread_locals.h - thread locals for each interpreter thread in MAXScript * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/time_fns.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/time_fns.h index 2d46db10..bacf7924 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/time_fns.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/time_fns.h @@ -1,7 +1,7 @@ /* * MAX_time_functions.h - recursive animatable time functions * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/timepro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/timepro.h index 6032b10a..2742aebd 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/timepro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/timepro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/toolpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/toolpro.h index f7b41ecb..fd0f6c24 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/toolpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/toolpro.h @@ -1,7 +1,7 @@ /* * toolpro.h - def_generics for the operations on MouseTool * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 */ def_visible_primitive(start_tool, "startTool"); diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/vectpro.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/vectpro.h index 2d83f004..df9253a0 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/vectpro.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Maxscrpt/vectpro.h @@ -4,7 +4,7 @@ * see def_abstract_generics.h for more info. * * - * Copyright © John Wainwright 1996 + * Copyright © John Wainwright 1996 * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Osnap.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Osnap.h index 335ca507..11aa9761 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/Osnap.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/Osnap.h @@ -95,8 +95,8 @@ public: virtual int NumCallbacks(){return 0;} virtual DllExport BOOL GetSupportedObject(INode *iNode, TimeValue t, ObjectState *os); - virtual TSTR *snapname(int index)=0; // the snap’s name to be displayed in the UI - virtual TSTR *tooltip(int index){return NULL;} // the snap’s name to be displayed in the UI + virtual TSTR *snapname(int index)=0; // the snap's name to be displayed in the UI + virtual TSTR *tooltip(int index){return NULL;} // the snap's name to be displayed in the UI virtual boolean ValidInput(SClass_ID scid, Class_ID cid)=0;//the objects it supports virtual OsnapMarker *GetMarker(int index)=0; // single object might contain subsnaps virtual WORD HiliteMode(){return HILITE_NORMAL;} diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/iBrowser.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/iBrowser.h index 90780850..5f4c3aef 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/iBrowser.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/iBrowser.h @@ -4,7 +4,7 @@ * contains public interface defintions for the global manager * and individual browsers * - * Copyright © Autodesk, Inc, 2000. John Wainwright. + * Copyright © Autodesk, Inc, 2000. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/iDragAndDrop.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/iDragAndDrop.h index 9a1f5d06..37407115 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/iDragAndDrop.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/iDragAndDrop.h @@ -1,7 +1,7 @@ /* * iDragAndDrop.h - SDK API to desktop drag-and-drop services in MAX * - * Copyright © Autodesk, Inc, 2000. John Wainwright. + * Copyright © Autodesk, Inc, 2000. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/iMSZip.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/iMSZip.h index f03f1a3b..da418a60 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/iMSZip.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/iMSZip.h @@ -1,7 +1,7 @@ /* * iMSZip.h - Public interface to MAXScript Zip Package Manager * - * Copyright © Autodesk, Inc, 2000. John Wainwright. + * Copyright © Autodesk, Inc, 2000. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/iParamWire.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/iParamWire.h index cba6c4f6..a7a37776 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/iParamWire.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/iParamWire.h @@ -1,7 +1,7 @@ /* * iParamWire.h - Public interface to Parameter Wiring Manager & Wire Controllers * - * Copyright © Autodesk, Inc, 2000. John Wainwright. + * Copyright © Autodesk, Inc, 2000. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/imacroscript.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/imacroscript.h index f18f87d5..f64c230a 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/imacroscript.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/imacroscript.h @@ -25,7 +25,7 @@ * drop onto the shelf or by evaling a definition in the listener will generate * a file in this directory to provide permanent storage. * - * Copyright © Autodesk, Inc, 1998. John Wainwright. + * Copyright © Autodesk, Inc, 1998. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/3dsmax4/Include/macrorec.h b/Gameleap/code/mw4/Libraries/3dsmax4/Include/macrorec.h index 972ca520..cb544dc0 100644 --- a/Gameleap/code/mw4/Libraries/3dsmax4/Include/macrorec.h +++ b/Gameleap/code/mw4/Libraries/3dsmax4/Include/macrorec.h @@ -3,7 +3,7 @@ * * The macro recorder * - * Copyright © Autodesk, Inc, 1998. John Wainwright. + * Copyright © Autodesk, Inc, 1998. John Wainwright. * */ diff --git a/Gameleap/code/mw4/Libraries/Adept/VideoRenderer.cpp b/Gameleap/code/mw4/Libraries/Adept/VideoRenderer.cpp index 3f873729..f6c4d395 100644 --- a/Gameleap/code/mw4/Libraries/Adept/VideoRenderer.cpp +++ b/Gameleap/code/mw4/Libraries/Adept/VideoRenderer.cpp @@ -209,14 +209,14 @@ void Renderer::SetRendererStatus(status); } -//»óÈƯ begin +//sanghoon begin #include #include #include "GameOS\render.hpp" extern IDirectDrawSurface7* SH_TargetBufferSurface; extern IDirect3DDevice7* d3dDevice7; -//»óÈƯ end +//sanghoon end //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -251,7 +251,7 @@ void SortedChainIteratorOf camera_iterator(&secondaryCameras); CameraComponent *camera; - //»óÈÆ ¾Õ + //sanghoon begin if(hsh_initialized){ if((camera = camera_iterator.ReadAndNext()) != NULL) { @@ -329,7 +329,7 @@ extern IDirectDrawSurface7* SH_TargetBufferSurface; } } } - //»óÈÆ µÚ + //sanghoon end sceneCamera->Execute(); @@ -353,9 +353,9 @@ extern IDirectDrawSurface7* SH_TargetBufferSurface; } } } - //»óÈÆ ¾Õ + //sanghoon begin #if 1 - //¿©±â¿¡ swirling effect¸¦ ±×¸°´Ù. + //Draw swirling effect here. extern LPDIRECT3DDEVICE7 d3dDevice7; extern IDirectDrawSurface7* SH_SwirlTexture; @@ -369,8 +369,8 @@ extern IDirectDrawSurface7* SH_TargetBufferSurface; preload_isdeathmode=true; } #endif - //»óÈÆ µÚ -//»óÈÆ.. end + //sanghoon end +//sanghoon end } //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Gameleap/code/mw4/Libraries/Adept/ctcl.h b/Gameleap/code/mw4/Libraries/Adept/ctcl.h index 41515b53..080fbea1 100644 --- a/Gameleap/code/mw4/Libraries/Adept/ctcl.h +++ b/Gameleap/code/mw4/Libraries/Adept/ctcl.h @@ -42,7 +42,7 @@ public: const char* m_pcsz; int m_nLauncherConnection; // 0: no connection, +1: connection, -1: connecting - int m_nConnection2; // m_bCameraShip°ª¿¡ µû¶ó °ÔÀÓ È¤Àº Ä«¸Þ¶ó ½±°úÀÇ Á¢¼ÓÀ» ÀǹÌ, 0: no connection, +1: connection, -1: connecting + int m_nConnection2; // Connection to game or camera ship per m_bCameraShip, 0: no connection, +1: connected, -1: connecting int m_nApplType; int m_nApplState; int m_nGameState; diff --git a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Headers/SDK/WinFileUtils.h b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Headers/SDK/WinFileUtils.h index 0cfca962..eb63d0a4 100644 --- a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Headers/SDK/WinFileUtils.h +++ b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Headers/SDK/WinFileUtils.h @@ -1,7 +1,7 @@ /* File: WinFileUtils.h - Copyright © 1997, Adobe Systems Incorporated. + Copyright © 1997, Adobe Systems Incorporated. All rights reserved. Header file for Windows file utilities. diff --git a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Headers/SDK/WinUtilities.h b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Headers/SDK/WinUtilities.h index 6f60fef4..c194cc80 100644 --- a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Headers/SDK/WinUtilities.h +++ b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Headers/SDK/WinUtilities.h @@ -1,4 +1,4 @@ -// © Copyright 1997. Adobe Systems, Incorporated. All rights reserved. +// © Copyright 1997. Adobe Systems, Incorporated. All rights reserved. #ifndef __WinUtilities_H__ #define __WinUtilities_H__ diff --git a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinDialogUtils.c b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinDialogUtils.c index f856e00b..9a18faae 100644 --- a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinDialogUtils.c +++ b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinDialogUtils.c @@ -1,7 +1,7 @@ /* File: WinDialogUtils.c - Copyright © 1997, Adobe Systems Incorporated. + Copyright © 1997, Adobe Systems Incorporated. All rights reserved. C source file for MS-Windows specific dialog code diff --git a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinFileUtils.c b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinFileUtils.c index d3ce0adc..621b654e 100644 --- a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinFileUtils.c +++ b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinFileUtils.c @@ -1,7 +1,7 @@ /* File: WinFileUtils.c - Copyright © 1997, Adobe Systems Incorporated. + Copyright © 1997, Adobe Systems Incorporated. All rights reserved. C source file for file utilities. diff --git a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinUtilities.c b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinUtilities.c index 95f96066..d332c22a 100644 --- a/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinUtilities.c +++ b/Gameleap/code/mw4/Libraries/PHOTOSHOP5.0SDK/Sources/WinUtilities.c @@ -1,4 +1,4 @@ -/* Copyright © 1997. Adobe Systems, Incorporated. All rights reserved. */ +/* Copyright © 1997. Adobe Systems, Incorporated. All rights reserved. */ #include "WinUtilities.h" diff --git a/Gameleap/code/mw4/Libraries/elementrenderer/CameraElement.cpp b/Gameleap/code/mw4/Libraries/elementrenderer/CameraElement.cpp index 0be19b0e..1aa8e035 100644 --- a/Gameleap/code/mw4/Libraries/elementrenderer/CameraElement.cpp +++ b/Gameleap/code/mw4/Libraries/elementrenderer/CameraElement.cpp @@ -216,9 +216,9 @@ ElementRenderer::CameraElement::CameraElement(StateChange *properties): m_acceptingElement = NULL; - //»óÈÆ ¾Õ + //sanghoon begin m_hsh_special_flag=false; - //»óÈÆ µÚ + //sanghoon end } //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -452,9 +452,9 @@ int return (camera != this) ? -1 : 0; } -//»óÈÆ ¾Õ +//sanghoon begin void __cdecl ClearTargetCameraBackBuffer(); -//»óÈÆ µÚ +//sanghoon end //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // @@ -546,11 +546,11 @@ void //----------------------------------------- // - //»óÈÆ ¾Õ + //sanghoon begin if(m_hsh_special_flag){ ClearTargetCameraBackBuffer(); } - //»óÈÆ µÚ + //sanghoon end m_clipper->StartDraw( m_localToWorld, @@ -632,7 +632,7 @@ void { ELEMENT_RENDER("Rasterizing"); Start_Timer(Render); -//»óÈÆ +//sanghoon extern bool sh_isdeathmode; if(!sh_isdeathmode) m_clipper->RenderNow(); diff --git a/Gameleap/code/mw4/Libraries/elementrenderer/CameraElement.hpp b/Gameleap/code/mw4/Libraries/elementrenderer/CameraElement.hpp index 30125f37..e85e1664 100644 --- a/Gameleap/code/mw4/Libraries/elementrenderer/CameraElement.hpp +++ b/Gameleap/code/mw4/Libraries/elementrenderer/CameraElement.hpp @@ -283,13 +283,13 @@ namespace ElementRenderer { m_viewPortBottom; Stuff::RGBAColor m_tintColor; bool m_useTintColor; - //»óÈÆ ¾Õ + //sanghoon begin public: bool m_hsh_special_flag; void SetHSHSpecialFlag(bool new_flag){ m_hsh_special_flag=new_flag; } - //»óÈÆ µÚ + //sanghoon end }; } diff --git a/Gameleap/code/mw4/Libraries/stuff/SafeChain_Test.cpp b/Gameleap/code/mw4/Libraries/stuff/SafeChain_Test.cpp index 2ffe8556..879b68cf 100644 --- a/Gameleap/code/mw4/Libraries/stuff/SafeChain_Test.cpp +++ b/Gameleap/code/mw4/Libraries/stuff/SafeChain_Test.cpp @@ -3,9 +3,9 @@ // // Created: Thursday, September 29, 1994, 2:37 PM // Author: Eric Huffman -// Project: Node.Û +// Project: Node.Û -// Compiler: 7.0, Û Symantec Corporation 1994 +// Compiler: 7.0, Û Symantec Corporation 1994 //----------------------------------------------------------------------- // 11/03/94 ECH Made compatible with BC4.0 //----------------------------------------------------------------------- diff --git a/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/JointPrefrence.cpp b/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/JointPrefrence.cpp index 69361ea8..976e64df 100644 --- a/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/JointPrefrence.cpp +++ b/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/JointPrefrence.cpp @@ -4,7 +4,7 @@ * * *************************************************************************** * * -* Version : 1.0ß, March 11th, 1998 * +* Version : 1.0ß, March 11th, 1998 * * * * Written By Loic Baumann from Fatal Design, specially for Gamasutra * * * diff --git a/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/LegMirrorPanel.cpp b/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/LegMirrorPanel.cpp index 137225c5..472e8bfc 100644 --- a/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/LegMirrorPanel.cpp +++ b/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/LegMirrorPanel.cpp @@ -4,7 +4,7 @@ * * *************************************************************************** * * -* Version : 1.0ß, March 11th, 1998 * +* Version : 1.0ß, March 11th, 1998 * * * * Written By Loic Baumann from Fatal Design, specially for Gamasutra * * * diff --git a/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/MissionImp.cpp b/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/MissionImp.cpp index f93a9738..c2d430ba 100644 --- a/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/MissionImp.cpp +++ b/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/MissionImp.cpp @@ -4,7 +4,7 @@ * * *************************************************************************** * * -* Version : 1.0ß, March 11th, 1998 * +* Version : 1.0ß, March 11th, 1998 * * * * Written By Loic Baumann from Fatal Design, specially for Gamasutra * * * diff --git a/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/Replicate.cpp b/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/Replicate.cpp index 3f309a79..afd31349 100644 --- a/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/Replicate.cpp +++ b/Gameleap/code/mw4/Tools/3DSPlugins/AnimationSuite/Replicate.cpp @@ -4,7 +4,7 @@ * * *************************************************************************** * * -* Version : 1.0ß, March 11th, 1998 * +* Version : 1.0ß, March 11th, 1998 * * * * Written By Loic Baumann from Fatal Design, specially for Gamasutra * * * diff --git a/Gameleap/code/mw4/Tools/AnimScript/Cstr.cpp b/Gameleap/code/mw4/Tools/AnimScript/Cstr.cpp index 78a8b128..cabf94a1 100644 --- a/Gameleap/code/mw4/Tools/AnimScript/Cstr.cpp +++ b/Gameleap/code/mw4/Tools/AnimScript/Cstr.cpp @@ -1077,7 +1077,7 @@ int CStrArray::GetTotalLength() const int nTotalLength; int i, nSize = GetSize(); - nTotalLength = nSize; // nSize°³ÀÇ '\0' + nTotalLength = nSize; // nSize null terminators '\0' for(i = 0; i < nSize; i++) { nTotalLength += strlen(GetAt(i)); } diff --git a/Gameleap/code/mw4/Tools/AnimScript/ctcl.cpp b/Gameleap/code/mw4/Tools/AnimScript/ctcl.cpp index fff53d69..eaae92c3 100644 --- a/Gameleap/code/mw4/Tools/AnimScript/ctcl.cpp +++ b/Gameleap/code/mw4/Tools/AnimScript/ctcl.cpp @@ -517,7 +517,7 @@ void CSOC_Server::OnSendFile() BYTE bCode; if (Disassemble("B", &bCode)) { ASSERT((bCode == 0) || (bCode == 3)); - // ¹Þ¾Æ°¡½Ã¿À from Game to console... + // Receiving from Game to console... SYSTEMTIME* pSysTime; WORD wSysTimeSize; GUID* pGUID; @@ -533,7 +533,7 @@ void CSOC_Server::OnSendFile() pSF = g_pCTCLManager->m_SFM_Recv.Find(*pGUID, nType); if (pSF) { if (bCode == 3) { - // ¹Ì¼Ç¸®ºä ¼­¹ö°¡ mission review ¹Þ¾Ò´Ù´Â °ÍÀ» ¹Þ¾Ò´À³Ä? + // Did we receive confirmation the mission review server got the mission review? pSF->m_bProcessed = true; g_pCTCLManager->m_SFM_Recv.Cut(pSF); g_pCTCLManager->m_SFM_Done.AddTail(pSF); @@ -910,7 +910,7 @@ void CSOC_Client::OnSendFile() BYTE bCode; if (Disassemble("B", &bCode)) { ASSERT((bCode == 1) || (bCode == 2)); - // ¹Þ¾Ò¿À from console to Game... + // Received from console to Game... SYSTEMTIME* pSysTime; WORD wSysTimeSize; GUID* pGUID; @@ -1438,21 +1438,21 @@ void CCTCLManager::Run() #endif // !defined(CTCL_LAUNCHER) } else { /* - Ŭ¶óÀ̾ðÆ®³ª ¼­¹öÀÇ °æ¿ì ½ÇÇàµÇ´Â ÄÚµåÀÌ´Ù. + Code executed for both client and server. - *ÀÖÀ»¼ö ÀÖ´Â »óŵé - ¼­¹ö/Ŭ¶óÀ̾ðÆ®°¡ °áÁ¤µÇ±âÀü.. ¸í·É ´ë±â»óÅ - (Á¾·á/¼­¹ö½ÃÀÛ/Ŭ¶óÀ̾ðÆ® ½ÃÀÛµîÀÇ ¸í·ÉÀÌ ¿Ã¼ö ÀÖ´Ù.) + *Possible states: + Before server/client role is determined: waiting for commands + (Commands such as exit/start-server/start-client may arrive.) - ¼­¹ö·Î ½ÇÇàµÇ¾î ¼­¹ö ¸ÞÅ© ¼³Á¤¿¡ ´ëÇÑ µ¥ÀÌŸ¸¦ ±â´Ù¸®´Â »óÅ - (CreateSession°¡ ½ÇÇàµÈ »óÅÂÀÌ´Ù.) - ¼­¹ö·Î ½ÇÇàµÇ¾î Botµé¿¡ ´ëÇÑ Á¤º¸¸¦ ±â´Ù¸®´Â »óÅ - (Ŭ¶óÀ̾ðÆ®ÀÇ Âü¿©´Â Ŭ¶óÀ̾ðÆ®¿Í ¼­¹ö°£¿¡ ÀÚµ¿À¸·Î ÀÌ·ç¾îÁø´Ù.) - ¼­¹ö·Î ½ÇÇàµÇ¾î Launch¸¦ ±â´Ù¸®´Â »óÅ + Running as server, waiting for server mech configuration data + (State after CreateSession has been called.) + Running as server, waiting for Bot information + (Client joining happens automatically between client and server.) + Running as server, waiting for Launch - ==>Ŭ¶óÀ̾ðÆ®´Â ½ÇÇàÁï½Ã µ¥ÀÌŸµéÀÌ Àü´ÞµÇ¹Ç·Î ´ë±â»óÅ°¡ ¾ø´Ù. + ==>Client has no waiting state as data is transferred immediately on startup. - ==>°¢°¢ÀÇ »óŸ¦ Á¤ÀÇÇÏ°í °¢ »óÅ¿¡ ¸Â´Â 󸮸¦ ÇØÁÖ¸é µÈ´Ù. + ==>Define each state and implement the appropriate handling for each. switch(state){ } */ @@ -1534,8 +1534,8 @@ void CCTCLManager::DoMech4Comm() } break; case 1: - //¼­¹ö/Ŭ¶óÀ̾ðÆ®·Î¼­ ½ÇÇàÁغñÇϵµ·Ï ¸í·ÉÀ» Àü´ÞÇÑ´Ù. - //¶ÇÇÑ ¼­¹ö¸¦ ½ÇÇàÇϴµ¥ ÇÊ¿äÇÑ ¸ðµç ÆĶó¹ÌÅ͵µ ÇÔ²² Àü´ÞÇÑ´Ù. + //Send command to prepare for execution as server/client. + //Also transmit all parameters required to run the server. for(i = 0; i < g_nPlayerInfos; i++) { SPlayerInfo& pi = g_aPlayerInfos[i]; if (!pi.m_bBot) { @@ -1562,12 +1562,12 @@ void CCTCLManager::DoMech4Comm() } } if (i == g_nPlayerInfos) { - // Botµé¿¡ ´ëÇÑ Á¤º¸¸¦ ¸ðµÎ Çѵ¥ ¹­¾î¼­ º¸³½´Ù. + // Bundle and send all Bot information together. CPacket pak(&SVR.GetGameSOC()); pak.Assemble("B", C_BOTS); for(i = 0; i < g_nPlayerInfos; i++) { - if (i != g_nServer) { // ¿ø·¡ Bot¸¸ Áö±ÝÀº ¼­¹ö¸¦ Á¦¿ÜÇÑ ÀüºÎ... + if (i != g_nServer) { // Originally bots only; now everyone except the server... SPlayerInfo& pi = g_aPlayerInfos[i]; pak.Assemble("BnsDWwsnn", pi.m_bBot, pi.m_nLevelOrTesla, pi.m_szName, pi.m_nMechIndex, pi.m_fileID, pi.m_recordID, pi.m_szMech, pi.m_nTeamOrSkin, pi.m_nDecal); } @@ -1578,10 +1578,10 @@ void CCTCLManager::DoMech4Comm() } break; case 4: - // °ÔÀÓÀÌ ¼º°øÀûÀ¸·Î ¸¸µé¾îÁö¸é ¼­¹ö¿Í Ŭ¶óÀ̾ðÆ®µéÀÇ Mech¿¡ ´ëÇÑ Á¤º¸µéÀ» SetÇÑ´Ù... + // Once the game is successfully created, set Mech info for server and all clients... if (SOCGame.m_nGameReturn == _EGR_OkCreateSession) { for(i = 0; i < g_nPlayerInfos; i++) { - if (i != g_nServer) { // ¼­¹ö´Â ÀÌ¹Ì SetMech¿¡ ÁøÀÔÇÑ »óÅÂ... + if (i != g_nServer) { // Server has already entered SetMech... SPlayerInfo& pi = g_aPlayerInfos[i]; if (!pi.m_bBot) { CTeslaInfo& ti = m_aTIs.GetAt(pi.m_nLevelOrTesla); @@ -1594,8 +1594,8 @@ void CCTCLManager::DoMech4Comm() } break; case 6: - //¸ðµç Ŭ¶óÀ̾ðµåµéÀÌ ¼­¹ö¿¡ Âü¿©Çϱ⸦ ±â´Ù¸°´Ù.<==ÀÌ ÀÀ´äÀº ¼­¹ö·Î ºÎÅÍ ¾òÀ» ¼ö ÀÖ´Ù. - //Âü¿©°¡ ¸ðµÎ ³¡³µÀ¸¸é, ¼­¹ö·Î ÇÏ¿©±Ý °ÔÀÓÀ» Launch½ÃÅ°µµ·Ï ÇÑ´Ù. + //Wait for all clients to join the server. <==This response comes from the server. + //Once all clients have joined, instruct the server to Launch the game. if (SOCGame.m_nGameReturn == _EGR_OkLaunchReady) { g_nMech4Comm = 9; } diff --git a/Gameleap/code/mw4/Tools/AnimScript/ctcl.h b/Gameleap/code/mw4/Tools/AnimScript/ctcl.h index 41515b53..080fbea1 100644 --- a/Gameleap/code/mw4/Tools/AnimScript/ctcl.h +++ b/Gameleap/code/mw4/Tools/AnimScript/ctcl.h @@ -42,7 +42,7 @@ public: const char* m_pcsz; int m_nLauncherConnection; // 0: no connection, +1: connection, -1: connecting - int m_nConnection2; // m_bCameraShip°ª¿¡ µû¶ó °ÔÀÓ È¤Àº Ä«¸Þ¶ó ½±°úÀÇ Á¢¼ÓÀ» ÀǹÌ, 0: no connection, +1: connection, -1: connecting + int m_nConnection2; // Connection to game or camera ship per m_bCameraShip, 0: no connection, +1: connected, -1: connecting int m_nApplType; int m_nApplState; int m_nGameState; diff --git a/Gameleap/code/mw4/Tools/AnimScript/ctime.cpp b/Gameleap/code/mw4/Tools/AnimScript/ctime.cpp index 89317a07..60c547c4 100644 --- a/Gameleap/code/mw4/Tools/AnimScript/ctime.cpp +++ b/Gameleap/code/mw4/Tools/AnimScript/ctime.cpp @@ -44,7 +44,7 @@ int GetDayEnd(int nYear, int nMonth) long GetTotalSeconds(int nYear, int nMonth, int nDay) { - // nYear, nMonth, nDay³¯ÀÇ 0½Ã 0ºÐ 0Ãʸ¦ 0À¸·Î ÇÑ ÃÊ´ÜÀ§ ¼ö... + // Seconds elapsed since 00:00:00 on the date nYear/nMonth/nDay... ASSERT(nYear >= 1970); ASSERT((1 <= nMonth) && (nMonth <= 12)); ASSERT(1 <= nDay); @@ -57,13 +57,13 @@ long GetTotalSeconds(int nYear, int nMonth, int nDay) if (IsLeapYear(nStart)) { nDays++; } - lTotal += nDays * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += nDays * 24 * 60 * 60; // 24 hours * 60 min * 60 sec } for(nStart = 1; nStart < nMonth; nStart++) { int nDayEnd = GetDayEnd(nYear, nStart); - lTotal += nDayEnd * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += nDayEnd * 24 * 60 * 60; // 24 hours * 60 min * 60 sec } - lTotal += (nDay - 1) * 24 * 60 * 60; // 24½Ã°£ 60ºÐ 60ÃÊ + lTotal += (nDay - 1) * 24 * 60 * 60; // 24 hours * 60 min * 60 sec return lTotal; } diff --git a/Gameleap/code/mw4/Tools/AnimScript/ctime.h b/Gameleap/code/mw4/Tools/AnimScript/ctime.h index 835eb000..eb787ad3 100644 --- a/Gameleap/code/mw4/Tools/AnimScript/ctime.h +++ b/Gameleap/code/mw4/Tools/AnimScript/ctime.h @@ -16,7 +16,7 @@ class CTimeDate public: union { struct { - // Bit Field´Â ¾ÕÂÊ¿¡ ÁöÁ¤µÈ °ÍÀÌ LowBitÀÌ´Ù. + // Bit Fields declared first are at the low-bit end. DWORD m_xDay: 5; // 2^0, 2^5-1 DWORD m_xMonth: 4; // 2^5, 2^4-1 DWORD m_xYear: TIMEDATE_YEAR_BITS; // from 1900-2155 // 2^9, 2^8-1 diff --git a/Gameleap/code/mw4/Tools/AnimScript/mugSocs.cpp b/Gameleap/code/mw4/Tools/AnimScript/mugSocs.cpp index 4488c3cf..55e830ca 100644 --- a/Gameleap/code/mw4/Tools/AnimScript/mugSocs.cpp +++ b/Gameleap/code/mw4/Tools/AnimScript/mugSocs.cpp @@ -1375,7 +1375,7 @@ void CSockAddr::SetTarget(const char* pcszAddr) { if (pcszAddr) { sin_addr.s_addr = inet_addr(pcszAddr); - if (sin_addr.s_addr == INADDR_ANY) { // 0.0.0.0À̱⠶§¹®¿¡ HOST/Network Addr¹«°ü + if (sin_addr.s_addr == INADDR_ANY) { // 0.0.0.0, HOST/Network Addr irrelevant hostent* pHN = gethostbyname(pcszAddr); if (pHN) { sin_addr.s_addr = *(u_long*)pHN->h_addr; @@ -3667,7 +3667,7 @@ CSOCListen* CSOCManager::DoListen(int nPort, PFN_CreateSOCClient pfnCSC, DWORD d pSOCListen = new CSOCListen(nPort); pSOCListen->SetCSCParam(pfnCSC, dwCSCParam1, dwCSCParam2); if (!DoListen(pSOCListen, nPort)) { - // °°Àº Æ÷Æ®¸¦ 2¹ø Listen ÇÏ´Â °æ¿ì?... + // Case of Listen on the same port twice?... pSOCListen = NULL; } diff --git a/Gameleap/code/mw4/Tools/AnimScript/mugsocs.h b/Gameleap/code/mw4/Tools/AnimScript/mugsocs.h index e0495c0a..4df009db 100644 --- a/Gameleap/code/mw4/Tools/AnimScript/mugsocs.h +++ b/Gameleap/code/mw4/Tools/AnimScript/mugsocs.h @@ -41,7 +41,7 @@ extern char SERVERID[]; #endif // !MAX_PACKET #ifndef MAX_FTPBUF #define MAX_FTPBUF 1024 -// MAX_FTPBUF´Â MAX_PACKETº¸´Ù ¹Ýµå½Ã ÀÛ¾Æ¾ß ÇÑ´Ù? +// MAX_FTPBUF must be smaller than MAX_PACKET? // 9+size==sizeof(bCmd) + sizeof(FTID) + sizeof(size) + size #endif // !MAX_FTPBUF @@ -251,7 +251,7 @@ private: #define ESTRF_USER_START 100 -#define ESTRF_PASSWORDCHANGED 110 // ·Î±×ÀÎÇÏ°í ÀÖ´Â µ¿¾È¿¡ Æнº¿öµå°¡ ¹Ù²ñ +#define ESTRF_PASSWORDCHANGED 110 // Password changed while logged in void Randomize(); @@ -268,7 +268,7 @@ union UPacketValue class CDAPacket : public SOCBase_Class { -// PacketÀÇ ¾Õ ºÎºÐÀ» ó¸®ÇÏ°í ³­ µÞ ºÎºÐÀÇ °¡º¯ ÆĶó¹ÌÅÍ... +// Variable parameters in the tail portion after processing the packet header... public: BYTE m_bCmd; BYTE m_bReserved; @@ -361,8 +361,8 @@ public: #define C_ROOM_MAKE 232 // s - name, s - password #define C_ROOM_JOIN 233 -// d - number(RoomÀ» ¶°³ª´Â °ÍÀº -1), s - password -#define S_ROOM_JOIN 233 // C_ROOM_MAKE/C_ROOM_JOINÀÇ °á°ú... +// d - number (leaving a Room = -1), s - password +#define S_ROOM_JOIN 233 // Result of C_ROOM_MAKE/C_ROOM_JOIN... // b - code(CSCODE_OK or error code), d - number #define C_ROOM_UPDS 234 // CSCODE_... + @ @@ -384,13 +384,13 @@ public: #define S_FTP 254 //... see ftp.txt #define X_KEEPALIVE 255 // no parameters, should be ignored... -#define TX_SYSTEM 0 // ½Ã½ºÅÛ ¸Þ½ÃÁö... -#define TX_NORMAL 1 // ÀÏ¹Ý Ã¤Æà ÅؽºÆ® -#define TX_WARNING 2 // °æ°í -#define TX_ERROR 3 // ¿À·ù -#define TX_FATAL 4 // Ä¡¸íÀûÀÎ ¿À·ù -#define TX_INFO 5 // »ç¿ëÀÚ Á¤º¸ µîÀÇ Information Result... -#define TX_SAY 6 // ±Ó¼Ó¸» +#define TX_SYSTEM 0 // System message... +#define TX_NORMAL 1 // Regular chat text +#define TX_WARNING 2 // Warning +#define TX_ERROR 3 // Error +#define TX_FATAL 4 // Fatal error +#define TX_INFO 5 // Information result (e.g. user info)... +#define TX_SAY 6 // Whisper #define TX_LOCAL 7 // local echo.... #define TX_UNKNOWN 0xffff // unknown... @@ -493,7 +493,7 @@ CPacket protected: CSOC* m_pSOC; private: - // ÀÌ ¾ÈÀÇ ºí·°Àº ¹Ýµå½Ã ¿¬¼ÓÇØ¾ß ÇÑ´Ù... + // The block within must be contiguous... WORD m_wLen; BYTE m_ba[MAX_PACKET]; // @@ -587,7 +587,7 @@ end of variable PACKET_MAP definitions... class CFileTransfer : public TDBLNK(CFileTransfer*) { public: - // ¼­¹ö·Î ºÎÅÍ ¹ÞÀº Á¤º¸... - ȤÀº Ŭ¶óÀ̾ðÆ®¿¡°Ô ÀüÇØÁÙ Á¤º¸... + // Information received from server... - or information to relay to client... BOOL m_bClientSite; DWORD m_dwFTID; DWORD m_dwGUARD; @@ -680,18 +680,18 @@ protected: // time out to Drop... DWORD m_dwKARcvTimeOut; #ifdef WIN32 - // º¸Åë Login°úÁ¤¿¡ ¾²ÀÌ´Â À©µµ¿ì ÇÚµé + // Window handle typically used during Login process HWND m_hWndOwner; #endif // WIN32 - // º¸Åë ±Û·Î¹ú º¯¼ö·Î ¾²ÀÌ´Â ¼ÒÄÏÆ÷ÀÎÅÍ¿¡ ´ëÇÑ ÀÚµ¿ NULL AssignÀ» À§ÇÏ¿© + // For auto NULL assignment of socket pointer typically used as a global variable PSOC* m_ppSOC; - // ¼ÒÄÏÀ» ±¸ºÐÇϱâ À§ÇÏ¿© »ç¿ëÀÚ ÇÁ·Î±×·¥¿¡¼­ ¾²ÀÌ´Â ¾ÆÀ̵ð - // ÁÖ·Î ¼­¹öÀÇ °æ¿ì¿¡´Â Ŭ¶óÀ̾ðÆ®°¡ Á¢¼ÓÇÒ ¶§¸¶´Ù °íÀ¯ ¾ÆÀ̵𸦠ºÎ¿©ÇÏ¿© »ç¿ë - // ÇϳªÀÇ Client°¡ ´Ù¼öÀÇ ¼­¹ö¿¡ Á¢¼ÓÇÒ ¶§(ÁÖ·Î StarÇü) °¢°¢ÀÇ Á¢¼ÓÀ» ±¸ºÐÇÒ ¶§ »ç¿ë - // Ŭ¶óÀ̾ðÆ®°¡ ÇϳªÀÇ ¼­¹ö¿¡¸¸ Á¢¼ÓÇÏ´Â °æ¿ì Ŭ¶óÀ̾ðÆ®°¡ ¼­¹ö¿¡ Á¢¼Ó ÁßÀÎÁö ȤÀº Á¢¼ÓÇß´ÂÁö¸¦ ÆÇ´ÜÇÒ ¶§ - // CSOCManager::FindSOC(CSOC_SERVER_ID==default)->GetConnectionState()¸¦ »ç¿ë. - // limits.h¸¦ includeÇؾßÇÔ. - // CSOC»ý¼º½ÃÀÇ ±âº»°ª: CSOCServer == CSOC_SERVER_ID(=INT_MIN), CSOCClient == CSOC_CLIENT_ID(=0), CSOCListen == CSOC_LISTEN_ID(=-1) + // ID used in user program to identify a socket + // Mainly for servers: assigns a unique ID each time a client connects + // Used to distinguish each connection when a client connects to multiple servers (Star topology) + // When a client connects to only one server: used to check if client is connecting or already connected + // Use CSOCManager::FindSOC(CSOC_SERVER_ID==default)->GetConnectionState(). + // Must include limits.h. + // Default values at CSOC creation: CSOCServer==CSOC_SERVER_ID(INT_MIN), CSOCClient==CSOC_CLIENT_ID(0), CSOCListen==CSOC_LISTEN_ID(-1) union { int m_nID; UINT m_uID; @@ -725,8 +725,8 @@ protected: DWORD m_xGracefulRemote: 1; DWORD m_xAbortyLocal: 1; DWORD m_xAbortyRemote: 1; - DWORD m_xLoginStarted: 1; // »ç¿ëÀÚ°¡ Á÷Á¢ °ªÀ» SettingÇØ¾ß ÇÑ´Ù. - DWORD m_xLoginOK: 1; // »ç¿ëÀÚ°¡ Á÷Á¢ °ªÀ» SettingÇØ¾ß ÇÑ´Ù. + DWORD m_xLoginStarted: 1; // Must be set directly by the caller. + DWORD m_xLoginOK: 1; // Must be set directly by the caller. } m_DW; DWORD m_dwVarFlags; }; diff --git a/Gameleap/code/mw4/Tools/AnimScript/nonmfc.h b/Gameleap/code/mw4/Tools/AnimScript/nonmfc.h index 0802a8a3..cfbf5f2a 100644 --- a/Gameleap/code/mw4/Tools/AnimScript/nonmfc.h +++ b/Gameleap/code/mw4/Tools/AnimScript/nonmfc.h @@ -6,7 +6,7 @@ inline BOOL AssertDialog(const char* pcszExpr, const char* pcszfile, int nLine) { char szBuf[MAX_PATH * 2]; - sprintf(szBuf, "\"%s\" ÆÄÀÏÀÇ %dÁÙ¿¡¼­ ASSERT!!!\n\nµð¹ö±ëÀ» ÇϽðڽÀ´Ï±î?", pcszfile, nLine); + sprintf(szBuf, "ASSERT!!! in \"%s\" at line %d\n\nDo you want to debug?", pcszfile, nLine); #ifdef WIN32 return ::MessageBox(NULL, szBuf, pcszExpr, MB_YESNO) == IDYES; diff --git a/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/JointPrefrence.cpp b/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/JointPrefrence.cpp index 69361ea8..976e64df 100644 --- a/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/JointPrefrence.cpp +++ b/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/JointPrefrence.cpp @@ -4,7 +4,7 @@ * * *************************************************************************** * * -* Version : 1.0ß, March 11th, 1998 * +* Version : 1.0ß, March 11th, 1998 * * * * Written By Loic Baumann from Fatal Design, specially for Gamasutra * * * diff --git a/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/LegMirrorPanel.cpp b/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/LegMirrorPanel.cpp index 137225c5..472e8bfc 100644 --- a/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/LegMirrorPanel.cpp +++ b/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/LegMirrorPanel.cpp @@ -4,7 +4,7 @@ * * *************************************************************************** * * -* Version : 1.0ß, March 11th, 1998 * +* Version : 1.0ß, March 11th, 1998 * * * * Written By Loic Baumann from Fatal Design, specially for Gamasutra * * * diff --git a/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/MissionImp.cpp b/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/MissionImp.cpp index f93a9738..c2d430ba 100644 --- a/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/MissionImp.cpp +++ b/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/MissionImp.cpp @@ -4,7 +4,7 @@ * * *************************************************************************** * * -* Version : 1.0ß, March 11th, 1998 * +* Version : 1.0ß, March 11th, 1998 * * * * Written By Loic Baumann from Fatal Design, specially for Gamasutra * * * diff --git a/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/Replicate.cpp b/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/Replicate.cpp index 3f309a79..afd31349 100644 --- a/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/Replicate.cpp +++ b/Gameleap/code/mw4/Tools/Max43DSPlugins/AnimationSuite/Replicate.cpp @@ -4,7 +4,7 @@ * * *************************************************************************** * * -* Version : 1.0ß, March 11th, 1998 * +* Version : 1.0ß, March 11th, 1998 * * * * Written By Loic Baumann from Fatal Design, specially for Gamasutra * * * diff --git a/Gameleap/code/mw4/Tools/PhotoShopPlugins/BidFormat/BidFormatUIWin.c b/Gameleap/code/mw4/Tools/PhotoShopPlugins/BidFormat/BidFormatUIWin.c index 929c24b2..398afdd2 100644 --- a/Gameleap/code/mw4/Tools/PhotoShopPlugins/BidFormat/BidFormatUIWin.c +++ b/Gameleap/code/mw4/Tools/PhotoShopPlugins/BidFormat/BidFormatUIWin.c @@ -1,7 +1,7 @@ /* File: BidFormatUIWin.c - Copyright © 1993-1997, Adobe Systems Incorporated. + Copyright © 1993-1997, Adobe Systems Incorporated. All rights reserved. C source file for MS-Windows specific code for BidFormat Plug-In diff --git a/Gameleap/mw4/Language.dll b/Gameleap/mw4/Language.dll index 0e3125f6..555d93f0 100644 --- a/Gameleap/mw4/Language.dll +++ b/Gameleap/mw4/Language.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aae8662740cc1ce962b603ad8ba40d3188ec1ade273a6f4a93b5a250d2d55dca -size 36864 +oid sha256:fcf660dfbdbd5a15dcf03cc2214907d9a7e94183f862e760ec6bca7d478585bf +size 49152 diff --git a/MW4/Language.dll b/MW4/Language.dll index 0e3125f6..555d93f0 100644 --- a/MW4/Language.dll +++ b/MW4/Language.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aae8662740cc1ce962b603ad8ba40d3188ec1ade273a6f4a93b5a250d2d55dca -size 36864 +oid sha256:fcf660dfbdbd5a15dcf03cc2214907d9a7e94183f862e760ec6bca7d478585bf +size 49152