Глупенькие изменения гояью

src/bitmap.cpp

@@ -227,7 +227,7 @@ Bitmap::Bitmap(const char *filename){
 
 	if (!imgSurf)
 		crash(Exception::SDLError, "Error loading image '%s': %s", filename, SDL_GetError());
-		
+
 	p->ensureFormat(imgSurf, SDL_PIXELFORMAT_ABGR8888);
 
 	if (imgSurf->w > glState.caps.maxTexSize || imgSurf->h > glState.caps.maxTexSize){
@@ -1072,6 +1072,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align){
 
 		shState->bindTex();
 		TEX::uploadSubImage(0, 0, txtSurf->w, txtSurf->h, txtSurf->pixels, GL_RGBA);
+		//TODO: настройка в зависимости от oneshot.conf
 		TEX::setSmooth(true);
 
 		Quad &quad = shState->gpQuad();
@@ -1142,7 +1143,6 @@ IntRect Bitmap::textSize(const char *str){
 
 	// i don't know if its right migration, i didn't find any other way
 	TTF_Text* text = TTF_CreateText(NULL, font, str, strlen(str));
-	
 	int w, h;
 	TTF_GetTextSize(text, &w, &h);
 

src/etc.cpp

@@ -24,9 +24,6 @@
 #include "serial-util.h"
 #include "exception.h"
 #include "meow.h"
-
-// this file doesn't exist, idk what to do if it, so i'll comment it.
-// #include <SDL3/SDL_types.h>
 #include <SDL3/SDL_pixels.h>
 
 Color::Color(double red, double green, double blue, double alpha)

src/filesystem.cpp

@@ -247,11 +247,6 @@ static void initReadOps(PHYSFS_File *handle, SDL_IOStream* &ops){
 	iface.read  = SDL_RWopsRead;
 	iface.write = SDL_RWopsWrite;
 
-	/* useless now :P
-	if (freeOnClose)
-		ops.close = SDL_RWopsCloseFree;
-	else */
-	
 	iface.flush = SDL_RWopsFlush;
 	iface.close = SDL_RWopsClose;
 

src/gl-debug.cpp

@@ -39,7 +39,7 @@ struct GLDebugLoggerPrivate{
 
 	void writeTimestamp(){
 		time(&timestamp);
-		*stream << "[GLDEBUG " << ctime(&timestamp) << "]";
+		*stream << "[GLDEBUG] [" << ctime(&timestamp) << "]";
 	}
 
 	void writeLine(const char *line){

src/plane.cpp

@@ -82,8 +82,7 @@ struct PlanePrivate{
 	      shader(ShaderType::SHADER_plane)
 	{
 		updateSrcRectCon();
-		prepareCon = shState->prepareDraw.connect
-		        (sigc::mem_fun(this, &PlanePrivate::prepare));
+		prepareCon = shState->prepareDraw.connect(sigc::mem_fun(this, &PlanePrivate::prepare));
 
 		qArray.resize(1);
 	}
@@ -101,8 +100,7 @@ struct PlanePrivate{
 		/* Cut old connection */
 		srcRectCon.disconnect();
 		/* Create new one */
-		srcRectCon = srcRect->valueChanged.connect
-				(sigc::mem_fun(this, &PlanePrivate::onSrcRectChange));
+		srcRectCon = srcRect->valueChanged.connect(sigc::mem_fun(this, &PlanePrivate::onSrcRectChange));
 	}
 
 	void updateQuadSource(){
@@ -399,4 +397,4 @@ void Plane::defaultSpriteShaderInit(SpriteShaderBase &shader){
 
 	shader.setColor(p->color->norm);
 	shader.setModulate(Vec4(1.0f, 1.0f, 1.0f, 1.0f));
-}
+}

src/sprite.cpp

@@ -114,8 +114,7 @@ struct SpritePrivate{
 
 		updateSrcRectCon();
 
-		prepareCon = shState->prepareDraw.connect
-		        (sigc::mem_fun(this, &SpritePrivate::prepare));
+		prepareCon = shState->prepareDraw.connect(sigc::mem_fun(this, &SpritePrivate::prepare));
 
 		wave.amp = 0;
 		wave.length = 180;