diff --git a/src/CBot/CBotVar.cpp b/src/CBot/CBotVar.cpp index 7190e2f5..ed2a43c7 100644 --- a/src/CBot/CBotVar.cpp +++ b/src/CBot/CBotVar.cpp @@ -899,7 +899,7 @@ CBotString CBotVarInt::GetValString() res.LoadString(TX_UNDEF); return res; } - + if ( m_binit == CBotVar::InitType::IS_NAN ) { res.LoadString(TX_NAN); diff --git a/src/app/input.cpp b/src/app/input.cpp index 9cce70e6..8cf9f99f 100644 --- a/src/app/input.cpp +++ b/src/app/input.cpp @@ -40,10 +40,10 @@ CInput::CInput() m_kmodState = 0; m_mousePos = Math::Point(); m_mouseButtonsState = 0; - + for(int i=0; i(i)); - + key.clear(); key.str(""); key << b.primary << " " << b.secondary; @@ -385,14 +385,14 @@ std::string CInput::GetKeysString(InputBinding b) if ( GetResource(RES_KEY, b.primary, iNameStr) ) { ss << iNameStr; - + if ( b.secondary != KEY_INVALID ) { if ( GetResource(RES_KEY, b.secondary, iNameStr) ) { std::string textStr; GetResource(RES_TEXT, RT_KEY_OR, textStr); - + ss << textStr << iNameStr; } } @@ -410,4 +410,4 @@ std::string CInput::GetKeysString(InputSlot slot) { InputBinding b = GetInputBinding(slot); return GetKeysString(b); -} \ No newline at end of file +} diff --git a/src/app/input.h b/src/app/input.h index c8269d50..4b52f4e2 100644 --- a/src/app/input.h +++ b/src/app/input.h @@ -41,7 +41,7 @@ struct InputBinding //! Primary and secondary bindings //! Can be regular key, virtual key or virtual joystick button unsigned int primary, secondary; - + InputBinding(unsigned int p = KEY_INVALID, unsigned int s = KEY_INVALID) : primary(p), secondary(s) {} }; @@ -70,93 +70,93 @@ class CInput : public CSingleton public: //! Constructor CInput(); - + //! Process an incoming event, also sets .kmodState, .mousePos, .mouseButtonsState and .key.slot void EventProcess(Event &event); - + //! Called by CApplication on SDL MOUSE_MOTION event void MouseMove(Math::IntPoint pos); - - + + //! Returns the current key modifiers int GetKmods() const; - + //! Returns whether the given kmod is active bool GetKmodState(int kmod) const; - + //! Returns whether the key is pressed bool GetKeyState(InputSlot key) const; - + //! Returns whether the mouse button is pressed bool GetMouseButtonState(int index) const; - + //! Resets tracked key states and modifiers void ResetKeyStates(); - + //! Returns the position of mouse cursor (in interface coords) Math::Point GetMousePos() const; - - + + //! Sets the default input bindings (keys and joystick axes) void SetDefaultInputBindings(); - + //! Management of input bindings //@{ void SetInputBinding(InputSlot slot, InputBinding binding); const InputBinding& GetInputBinding(InputSlot slot); //@} - + //! Management of joystick axis bindings //@{ void SetJoyAxisBinding(JoyAxisSlot slot, JoyAxisBinding binding); const JoyAxisBinding& GetJoyAxisBinding(JoyAxisSlot slot); //@} - + //! Management of joystick deadzone //@{ void SetJoystickDeadzone(float zone); float GetJoystickDeadzone(); //@} - + //! Get binding slot for given key InputSlot FindBinding(unsigned int key); - + //! Saving/loading key bindings to colobot.ini //@{ void SaveKeyBindings(); void LoadKeyBindings(); //@} - + //! Seeks a InputSlot by id. Returns INPUT_SLOT_MAX if not found InputSlot SearchKeyById(std::string name); - + //! Returns string describing keys to be pressed //@{ std::string GetKeysString(InputBinding binding); std::string GetKeysString(InputSlot slot); //@} - + private: //! Current state of key modifiers (bitmask of SDLMod) unsigned int m_kmodState; //! Current state of keys bool m_keyPresses[INPUT_SLOT_MAX]; - - + + //! Current position of mouse cursor Math::Point m_mousePos; //! Current state of mouse buttons (bitmask of MouseButton enum values) unsigned int m_mouseButtonsState; - - + + //! Motion vector set by keyboard or joystick buttons Math::Vector m_keyMotion; //! Motion vector set by joystick axes Math::Vector m_joyMotion; - - + + //! Bindings for user inputs InputBinding m_inputBindings[INPUT_SLOT_MAX]; JoyAxisBinding m_joyAxisBindings[JOY_AXIS_SLOT_MAX]; float m_joystickDeadzone; -}; \ No newline at end of file +}; diff --git a/src/app/main.cpp b/src/app/main.cpp index 0d1e289e..49d61b20 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -111,12 +111,12 @@ int SDL_MAIN_FUNC(int argc, char *argv[]) InitializeEventTypeTexts(); logger.Info("%s starting\n", COLOBOT_FULLNAME); - + int code = 0; while(true) { CSystemUtils* systemUtils = CSystemUtils::Create(); // platform-specific utils systemUtils->Init(); - + CApplication* app = new CApplication(); // single instance of the application ParseArgsStatus status = app->ParseArguments(argc, argv); diff --git a/src/common/image.cpp b/src/common/image.cpp index 882caf4a..9a40462f 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -448,8 +448,8 @@ void CImage::SetDataPixels(void *pixels){ } } -void CImage::flipVertically(){ - +void CImage::FlipVertically() +{ SDL_Surface* result = SDL_CreateRGBSurface( m_data->surface->flags, m_data->surface->w, m_data->surface->h, @@ -467,7 +467,8 @@ void CImage::flipVertically(){ Uint32 pitch = m_data->surface->pitch; Uint32 pxLength = pitch*m_data->surface->h; - for(int line = 0; line < m_data->surface->h; ++line) { + for (int line = 0; line < m_data->surface->h; ++line) + { Uint32 pos = line * pitch; memcpy(&resultPixels[pos], &srcPixels[(pxLength-pos)-pitch], pitch); } diff --git a/src/common/image.h b/src/common/image.h index e0e270a0..54a82607 100644 --- a/src/common/image.h +++ b/src/common/image.h @@ -113,9 +113,9 @@ public: std::string GetError(); //! Flips the image vertically - void flipVertically(); - - //! sets/replaces the pixels from the surface + void FlipVertically(); + + //! sets/replaces the pixels from the surface void SetDataPixels(void *pixels); private: diff --git a/src/common/key.cpp b/src/common/key.cpp index a184b04a..4430843d 100644 --- a/src/common/key.cpp +++ b/src/common/key.cpp @@ -31,7 +31,7 @@ unsigned int GetVirtualKey(unsigned int key) return VIRTUAL_KMOD(META); if(key == KEY(KP_ENTER)) - return KEY(RETURN); + return KEY(RETURN); return key; -} \ No newline at end of file +} diff --git a/src/common/key.h b/src/common/key.h index 9ee59c49..4f72321b 100644 --- a/src/common/key.h +++ b/src/common/key.h @@ -102,7 +102,7 @@ enum InputSlot INPUT_SLOT_CAMERA_UP, INPUT_SLOT_CAMERA_DOWN, INPUT_SLOT_PAUSE, - + INPUT_SLOT_MAX }; @@ -115,6 +115,6 @@ enum JoyAxisSlot JOY_AXIS_SLOT_X, JOY_AXIS_SLOT_Y, JOY_AXIS_SLOT_Z, - + JOY_AXIS_SLOT_MAX -}; \ No newline at end of file +}; diff --git a/src/common/misc.cpp b/src/common/misc.cpp index 1234f7bc..97fc1c1a 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp @@ -258,4 +258,4 @@ void AddExt(char* filename, const char* ext) int GetCurrentTimestamp() { return std::chrono::seconds(std::time(NULL)).count(); -} \ No newline at end of file +} diff --git a/src/common/pathman.h b/src/common/pathman.h index c7ca7b35..a17d931e 100644 --- a/src/common/pathman.h +++ b/src/common/pathman.h @@ -66,4 +66,4 @@ private: std::string m_langPath; //! Save path std::string m_savePath; -}; \ No newline at end of file +}; diff --git a/src/common/regex_utils.cpp b/src/common/regex_utils.cpp index e84aa225..9c7b47d7 100644 --- a/src/common/regex_utils.cpp +++ b/src/common/regex_utils.cpp @@ -41,6 +41,3 @@ boost::smatch RegexUtils::AssertRegexMatch(const std::string& text, const std::s return matches; } - - /* - boost::cmatch matches;*/ \ No newline at end of file diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 9ea2f835..a8e6182b 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -487,7 +487,7 @@ bool CEngine::WriteScreenShot(const std::string& fileName, int width, int height CImage img({width, height}); img.SetDataPixels(pixels); - img.flipVertically(); + img.FlipVertically(); if ( img.SavePNG(fileName.c_str()) ) { diff --git a/src/graphics/engine/terrain.cpp b/src/graphics/engine/terrain.cpp index 5f61f521..15a1abf5 100644 --- a/src/graphics/engine/terrain.cpp +++ b/src/graphics/engine/terrain.cpp @@ -339,10 +339,10 @@ bool CTerrain::RandomizeRelief() // Perlin noise // Based on Python implementation by Marek Rogalski (mafik) // http://amt2014.pl/archiwum/perlin.py - + int size = (m_mosaicCount*m_brickCount)+1; const int ilosc_oktaw = 6; - + float* oktawy[ilosc_oktaw]; for(int i=0; i(y2) / size; for(int x2=0; x2 < size; x2++) { float x = static_cast(x2) / size; - + float wart = 0; for(int i=0; i(yi * rozmiar_oktawy + xi)]; float pg = oktawy[i][static_cast(yi * rozmiar_oktawy + xi + 1)]; float ld = oktawy[i][static_cast((yi+1) * rozmiar_oktawy + xi)]; float pd = oktawy[i][static_cast((yi+1) * rozmiar_oktawy + xi + 1)]; - + float g = pg * a + lg * (1-a); float d = pd * a + ld * (1-a); float res = d * b + g * (1-b); wart += res; } - + wart /= ilosc_oktaw; m_relief[x2+y2*size] = wart * 255.0f; diff --git a/src/graphics/opengl/gl21device.cpp b/src/graphics/opengl/gl21device.cpp index e7aafa2a..fde1585d 100644 --- a/src/graphics/opengl/gl21device.cpp +++ b/src/graphics/opengl/gl21device.cpp @@ -619,24 +619,24 @@ Texture CGL21Device::CreateTexture(ImageData *data, const TextureCreateParams &p // Set mipmap level and automatic mipmap generation if neccesary if (params.mipmap) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1); - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1); + glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); } else { - // Has to be set to 0 because no mipmaps are generated - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE); + // Has to be set to 0 because no mipmaps are generated + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE); } // Set anisotropy level if available if (m_anisotropyAvailable) { - float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel()); + float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel()); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level); } bool convert = false; diff --git a/src/graphics/opengl/gl33device.cpp b/src/graphics/opengl/gl33device.cpp index c78271b4..c42a4f28 100644 --- a/src/graphics/opengl/gl33device.cpp +++ b/src/graphics/opengl/gl33device.cpp @@ -647,22 +647,22 @@ Texture CGL33Device::CreateTexture(ImageData *data, const TextureCreateParams &p // Set mipmap level and automatic mipmap generation if neccesary if (params.mipmap) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1); } else { - // Has to be set to 0 because no mipmaps are generated - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + // Has to be set to 0 because no mipmaps are generated + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); } // Set anisotropy level if available if (m_anisotropyAvailable) { - float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel()); + float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel()); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level); } bool convert = false; diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp index bf1deba8..0dd42b59 100644 --- a/src/graphics/opengl/gldevice.cpp +++ b/src/graphics/opengl/gldevice.cpp @@ -592,24 +592,24 @@ Texture CGLDevice::CreateTexture(ImageData *data, const TextureCreateParams &par // Set mipmap level and automatic mipmap generation if neccesary if (params.mipmap) { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1); - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapLevel - 1); + glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); } else { - // Has to be set to 0 because no mipmaps are generated - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); - glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE); + // Has to be set to 0 because no mipmaps are generated + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_FALSE); } // Set anisotropy level if available if (m_anisotropyAvailable) { - float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel()); + float level = Math::Min(m_maxAnisotropy, CEngine::GetInstance().GetTextureAnisotropyLevel()); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, level); } bool convert = false; diff --git a/src/graphics/opengl/glframebuffer.h b/src/graphics/opengl/glframebuffer.h index bae67fec..ed366a2e 100644 --- a/src/graphics/opengl/glframebuffer.h +++ b/src/graphics/opengl/glframebuffer.h @@ -27,7 +27,7 @@ namespace Gfx { /** * \class CGLFramebuffer * \brief Implementation of CFramebuffer interface in OpenGL 3.0+ - * + * * Provides the concrete implementation of core framebuffers. * Can be used in OpenGL 3.0+ and with ARB_framebuffer_object supported. */ diff --git a/src/graphics/opengl/shaders/fragment_shader_33_perpixel.glsl b/src/graphics/opengl/shaders/fragment_shader_33_perpixel.glsl index 9a09532a..6d8cb685 100644 --- a/src/graphics/opengl/shaders/fragment_shader_33_perpixel.glsl +++ b/src/graphics/opengl/shaders/fragment_shader_33_perpixel.glsl @@ -73,22 +73,22 @@ out vec4 out_FragColor; void main() { vec4 color = data.Color; - + if (uni_LightingEnabled) { vec4 ambient = vec4(0.0f); vec4 diffuse = vec4(0.0f); vec4 specular = vec4(0.0f); - + for(int i=0; i<8; i++) { if(uni_Light[i].Enabled) { vec3 normal = (gl_FrontFacing ? data.Normal : -data.Normal); - + vec3 lightDirection = vec3(0.0f); float atten; - + // Directional light if(uni_Light[i].Position[3] == 0.0f) { @@ -100,55 +100,55 @@ void main() { vec3 lightDirection = normalize(uni_Light[i].Position.xyz - data.Position.xyz); float dist = distance(uni_Light[i].Position.xyz, data.Position.xyz); - + atten = 1.0f / (uni_Light[i].Attenuation.x + uni_Light[i].Attenuation.y * dist + uni_Light[i].Attenuation.z * dist * dist); } - + vec3 reflectDirection = -reflect(lightDirection, normal); - + ambient += uni_Light[i].Ambient; diffuse += atten * clamp(dot(normal, lightDirection), 0.0f, 1.0f) * uni_Light[i].Diffuse; specular += atten * clamp(pow(dot(normal, lightDirection + reflectDirection), 10.0f), 0.0f, 1.0f) * uni_Light[i].Specular; } } - + vec4 result = uni_AmbientColor * ambient + uni_DiffuseColor * diffuse + uni_SpecularColor * specular; - + color.rgb = min(vec3(1.0f), result.rgb); color.a = 1.0f; //min(1.0f, 1.0f); } - + if (uni_PrimaryTextureEnabled) { color = color * texture(uni_PrimaryTexture, data.TexCoord0); } - + if (uni_SecondaryTextureEnabled) { color = color * texture(uni_SecondaryTexture, data.TexCoord1); } - + if (uni_ShadowTextureEnabled) { color = color * mix(uni_ShadowColor, 1.0f, texture(uni_ShadowTexture, data.ShadowCoord.xyz)); } - + if (uni_FogEnabled) { float interpolate = (data.Distance - uni_FogRange.x) / (uni_FogRange.y - uni_FogRange.x); - + color = mix(color, uni_FogColor, clamp(interpolate, 0.0f, 1.0f)); } - + if (uni_AlphaTestEnabled) { if(color.a < uni_AlphaReference) discard; } - + out_FragColor = color; } diff --git a/src/graphics/opengl/shaders/fragment_shader_33_pervertex.glsl b/src/graphics/opengl/shaders/fragment_shader_33_pervertex.glsl index e8a87248..e8461bcd 100644 --- a/src/graphics/opengl/shaders/fragment_shader_33_pervertex.glsl +++ b/src/graphics/opengl/shaders/fragment_shader_33_pervertex.glsl @@ -52,34 +52,34 @@ out vec4 out_FragColor; void main() { vec4 color = data.Color; - + if (uni_PrimaryTextureEnabled) { color = color * texture(uni_PrimaryTexture, data.TexCoord0); } - + if (uni_SecondaryTextureEnabled) { color = color * texture(uni_SecondaryTexture, data.TexCoord1); } - + if (uni_ShadowTextureEnabled) { color = color * mix(uni_ShadowColor, 1.0f, texture(uni_ShadowTexture, data.ShadowCoord.xyz)); } - + if (uni_FogEnabled) { float interpolate = (data.Distance - uni_FogRange.x) / (uni_FogRange.y - uni_FogRange.x); - + color = mix(color, uni_FogColor, clamp(interpolate, 0.0f, 1.0f)); } - + if (uni_AlphaTestEnabled) { if(color.a < uni_AlphaReference) discard; } - + out_FragColor = color; } diff --git a/src/graphics/opengl/shaders/vertex_shader_33_perpixel.glsl b/src/graphics/opengl/shaders/vertex_shader_33_perpixel.glsl index a00bf98c..177e9ef1 100644 --- a/src/graphics/opengl/shaders/vertex_shader_33_perpixel.glsl +++ b/src/graphics/opengl/shaders/vertex_shader_33_perpixel.glsl @@ -50,7 +50,7 @@ void main() gl_Position = uni_ProjectionMatrix * eyeSpace; vec3 normal = normalize((uni_NormalMatrix * vec4(in_Normal, 0.0f)).xyz); - + data.Color = in_Color; data.Normal = normal; data.TexCoord0 = in_TexCoord0; diff --git a/src/math/geometry.h b/src/math/geometry.h index 57557771..dec18eba 100644 --- a/src/math/geometry.h +++ b/src/math/geometry.h @@ -518,7 +518,7 @@ inline Math::Vector NormalToPlane(const Math::Vector &p1, const Math::Vector &p2 inline Math::Vector SegmentPoint(const Math::Vector &p1, const Math::Vector &p2, float dist) { Math::Vector direction = p2 - p1; - + direction.Normalize(); return p1 + direction * dist; diff --git a/src/object/mission_type.h b/src/object/mission_type.h index 8ad71fce..580ec45e 100644 --- a/src/object/mission_type.h +++ b/src/object/mission_type.h @@ -19,8 +19,9 @@ #pragma once -enum MissionType { +enum MissionType +{ MISSION_NORMAL = 0, MISSION_RETRO, MISSION_CODE_BATTLE -}; \ No newline at end of file +}; diff --git a/src/object/scene_conditions.cpp b/src/object/scene_conditions.cpp index a240b6ee..b0c9e01f 100644 --- a/src/object/scene_conditions.cpp +++ b/src/object/scene_conditions.cpp @@ -173,4 +173,4 @@ void CAudioChangeCondition::Read(CLevelParserLine* line) CSceneCondition::Read(line); this->music = std::string("../")+line->GetParam("filename")->AsPath("music"); this->repeat = line->GetParam("repeat")->AsBool(true); -} \ No newline at end of file +} diff --git a/src/object/scene_conditions.h b/src/object/scene_conditions.h index 0b8f74bc..73da9e9e 100644 --- a/src/object/scene_conditions.h +++ b/src/object/scene_conditions.h @@ -102,4 +102,4 @@ public: //! Read from line in scene file virtual void Read(CLevelParserLine* line); -}; \ No newline at end of file +}; diff --git a/src/object/task/taskdeletemark.cpp b/src/object/task/taskdeletemark.cpp index 35f533b3..259c6aa3 100644 --- a/src/object/task/taskdeletemark.cpp +++ b/src/object/task/taskdeletemark.cpp @@ -88,4 +88,4 @@ void CTaskDeleteMark::DeleteMark() { CObjectManager::GetInstancePointer()->DeleteObject(obj); } -} \ No newline at end of file +} diff --git a/src/object/task/taskdeletemark.h b/src/object/task/taskdeletemark.h index a2e3f61d..f2bf965c 100644 --- a/src/object/task/taskdeletemark.h +++ b/src/object/task/taskdeletemark.h @@ -41,4 +41,4 @@ protected: void DeleteMark(); protected: bool m_bExecuted; -}; \ No newline at end of file +}; diff --git a/src/ui/color.cpp b/src/ui/color.cpp index ddf7629f..e2c79d31 100644 --- a/src/ui/color.cpp +++ b/src/ui/color.cpp @@ -143,7 +143,7 @@ void CColor::Draw() m_engine->SetTexture("textures/interface/button1.png"); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); CControl::Draw(); - + p1.x = m_pos.x + (3.0f / 640.0f); p1.y = m_pos.y + (3.0f / 480.0f); p2.x = m_pos.x + m_dim.x - (3.0f / 640.0f); diff --git a/src/ui/studio.h b/src/ui/studio.h index 5118375d..36c3d8a4 100644 --- a/src/ui/studio.h +++ b/src/ui/studio.h @@ -70,7 +70,7 @@ public: void StartEditScript(CScript *script, std::string name, Program* program); bool StopEditScript(bool bCancel); - + void SetInfoText(std::string text, bool bClickable); protected: @@ -94,7 +94,7 @@ protected: std::string SearchDirectory(bool bCreate); bool ReadProgram(); bool WriteProgram(); - + void SetFilenameField(CEdit* edit, const std::string& filename); protected: