This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git "a/C:\\Users\\Mariano\\AppData\\Local\\Temp\\TortoiseGit\\effC60E.tmp\\effects-ad1ab88-left.cpp" "b/C:\\Users\\Mariano\\Documents\\GitHub\\easyrpg-player\\src\\effects.cpp" | |
index 5af3aae..703cc3b 100644 | |
--- "a/C:\\Users\\Mariano\\AppData\\Local\\Temp\\TortoiseGit\\effC60E.tmp\\effects-ad1ab88-left.cpp" | |
+++ "b/C:\\Users\\Mariano\\Documents\\GitHub\\easyrpg-player\\src\\effects.cpp" | |
@@ -146,7 +146,7 @@ void Bitmap::EffectsBlit(int x, int y, Bitmap const& src, Rect const& src_rect_, | |
} | |
if (rotate) { | |
- Matrix fwd = Matrix::Setup(angle, zoom_x, zoom_y, src_rect.x, src_rect.y, x, y); | |
+ Matrix fwd = Matrix::Setup(-angle, zoom_x, zoom_y, src_rect.x + src.GetWidth() / 2, src_rect.y + src.GetHeight() / 2, x + src.GetWidth() / 2, y + src.GetHeight() / 2); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git "a/C:\\Users\\Mariano\\AppData\\Local\\Temp\\TortoiseGit\\fil5688.tmp\\filefinder-95804c6-left.cpp" "b/C:\\Users\\Mariano\\Documents\\GitHub\\Player\\src\\filefinder.cpp" | |
index af1ecb2..bb6a387 100644 | |
--- "a/C:\\Users\\Mariano\\AppData\\Local\\Temp\\TortoiseGit\\fil5688.tmp\\filefinder-95804c6-left.cpp" | |
+++ "b/C:\\Users\\Mariano\\Documents\\GitHub\\Player\\src\\filefinder.cpp" | |
@@ -225,6 +225,13 @@ void FileFinder::InitRtpPaths() { | |
rtp_path = Registry::ReadStrValue(HKEY_LOCAL_MACHINE, "Software\\ASCII\\RPG" + version_str, "RuntimePackagePath"); | |
if(! rtp_path.empty()) { add_rtp_path(rtp_path); } | |
+ | |
+ rtp_path = Registry::ReadStrValue(HKEY_CURRENT_USER, "Software\\Enterbrain\\rpg" + version_str, "RuntimePackagePath"); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
///////////////////////////////////////////////////////////////////////////// | |
// This file is part of EasyRPG Player. | |
// | |
// EasyRPG Player is free software: you can redistribute it and/or modify | |
// it under the terms of the GNU General Public License as published by | |
// the Free Software Foundation, either version 3 of the License, or | |
// (at your option) any later version. | |
// | |
// EasyRPG Player is distributed in the hope that it will be useful, | |
// but WITHOUT ANY WARRANTY; without even the implied warranty of |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1>------ Operación Generar iniciada: proyecto: readers, configuración: Debug Win32 ------ | |
1> readers.vcxproj -> C:\Users\Mariano\Documents\GitHub\Player\lib\readers\builds\vs2010\..\..\lib\Debug\readers.lib | |
2>------ Operación Generar iniciada: proyecto: EasyRPG, configuración: Debug Win32 ------ | |
2> battle_actions.cpp | |
2> player.cpp | |
2> scene_battle.cpp | |
2>c:\program files (x86)\microsoft visual studio 10.0\vc\include\string(14): error C2143: error de sintaxis : falta ';' delante de 'namespace' | |
2>c:\users\mariano\documents\github\player\src\utils.h(24): error C2143: error de sintaxis : falta ';' delante de 'namespace' | |
2> scene_battle2k.cpp | |
2> scene_battle2k3.cpp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
///////////////////////////////////////////////////////////////////////////// | |
// This file is part of EasyRPG Player. | |
// | |
// EasyRPG Player is free software: you can redistribute it and/or modify | |
// it under the terms of the GNU General Public License as published by | |
// the Free Software Foundation, either version 3 of the License, or | |
// (at your option) any later version. | |
// | |
// EasyRPG Player is distributed in the hope that it will be useful, | |
// but WITHOUT ANY WARRANTY; without even the implied warranty of |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
///////////////////////////////////////////////////////////////////////////// | |
// This file is part of EasyRPG Player. | |
// | |
// EasyRPG Player is free software: you can redistribute it and/or modify | |
// it under the terms of the GNU General Public License as published by | |
// the Free Software Foundation, either version 3 of the License, or | |
// (at your option) any later version. | |
// | |
// EasyRPG Player is distributed in the hope that it will be useful, | |
// but WITHOUT ANY WARRANTY; without even the implied warranty of |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
///////////////////////////////////////////////////////////////////////////// | |
// This file is part of EasyRPG Player. | |
// | |
// EasyRPG Player is free software: you can redistribute it and/or modify | |
// it under the terms of the GNU General Public License as published by | |
// the Free Software Foundation, either version 3 of the License, or | |
// (at your option) any later version. | |
// | |
// EasyRPG Player is distributed in the hope that it will be useful, | |
// but WITHOUT ANY WARRANTY; without even the implied warranty of |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
void Window_VarList::DrawItemValue(int index){ | |
if (show_switch){ | |
contents->TextDraw(0, 16 * index + 2, Font::ColorDefault, Game_Switches[range*10+index] ? "[ON]" : "[OFF]"); | |
} | |
else { | |
std::string ss = std::string("%d", Game_Variables[range*10+index]); | |
contents->TextDraw(0, 16 * index + 2, Font::ColorDefault, ss); | |
} | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#ifndef GAMECHARACTER_H | |
#define GAMECHARACTER_H | |
#include <QString> | |
#include <QVector> | |
struct Skillbook{ | |
int lvl; | |
int skill_id; | |
}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include "dialogdatabase.h" | |
#include "ui_dialogdatabase.h" | |
#include <QPushButton> | |
#include <QInputDialog> | |
#include <sstream> | |
#include <iomanip> | |
DialogDataBase::DialogDataBase(QWidget *parent) : | |
QDialog(parent), | |
ui(new Ui::DialogDataBase) |
OlderNewer