snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-22 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

meow(

Browse source
This commit is contained in:
DepressedTWM 2026-06-03 09:41:49 -04:00
parent 97e0c161b0
commit 0dcaa96eb8
4 changed files with 25 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
CMakeLists.txt
View file

@ -1,18 +1,29 @@
cmake_minimum_required(VERSION 3.28.3) cmake_minimum_required(VERSION 3.28.3)
project(oneshot) project(oneshot)
## Setup options ##
set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
set(VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION "5.1.2600.0")
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
# Options
option(STEAM "Build for Steam" OFF) option(STEAM "Build for Steam" OFF)
set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
option(DEBUG "Debug mode" OFF) option(DEBUG "Debug mode" OFF)
#For paranoicws:3 option(FORCE32 "Force 32bit compile on 64bit OS" OFF) # from MKXP
option(EXTRA_SECURITY "Extra security" OFF) option(EXTRA_SECURITY "Extra security" OFF)
set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
set(VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION "5.1.2600.0")
set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
set(ZLIB_USE_STATIC_LIBS ON) set(ZLIB_USE_STATIC_LIBS ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# from MKXP
if(FORCE32)
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "i386")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
endif()
endif()
if(DEBUG) if(DEBUG)
# Debug stuff # Debug stuff
if (MSVC) if (MSVC)

31
src/font.cpp
View file

@ -340,48 +340,27 @@ const std::vector<std::string> &Font::getInitialDefaultNames(){
void Font::initDynAttribs(){ void Font::initDynAttribs(){
p->color = new Color(p->colorTmp); p->color = new Color(p->colorTmp);
if (rgssVer >= 3)
p->outColor = new Color(p->outColorTmp);;
} }
void Font::initDefaultDynAttribs(){ void Font::initDefaultDynAttribs(){
FontPrivate::defaultColor = new Color(FontPrivate::defaultColorTmp); FontPrivate::defaultColor = new Color(FontPrivate::defaultColorTmp);
if (rgssVer >= 3)
FontPrivate::defaultOutColor = new Color(FontPrivate::defaultOutColorTmp);
} }
void Font::initDefaults(const SharedFontState &sfs){ void Font::initDefaults(const SharedFontState &sfs){
std::vector<std::string> &names = FontPrivate::initialDefaultNames; std::vector<std::string> &names = FontPrivate::initialDefaultNames;
switch (rgssVer){ // FIXME: Japanese version has "MS PGothic" instead
case 1 : names.push_back("Arial");
// FIXME: Japanese version has "MS PGothic" instead
names.push_back("Arial");
break;
case 2 :
names.push_back("UmePlus Gothic");
names.push_back("MS Gothic");
names.push_back("Courier New");
break;
default:
case 3 :
names.push_back("VL Gothic");
}
setDefaultName(names, sfs); setDefaultName(names, sfs);
FontPrivate::defaultOutline = (rgssVer >= 3 ? true : false); FontPrivate::defaultOutline = false;
FontPrivate::defaultShadow = (rgssVer == 2 ? true : false); FontPrivate::defaultShadow = false;
} }
TTF_Font *Font::getSdlFont(){ TTF_Font *Font::getSdlFont(){
if (!p->sdlFont) if (!p->sdlFont)
p->sdlFont = shState->fontState().getFont(p->name.c_str(), p->sdlFont = shState->fontState().getFont(p->name.c_str(), p->size);
p->size);
int style = TTF_STYLE_NORMAL; int style = TTF_STYLE_NORMAL;

8
src/main.cpp
View file

@ -112,9 +112,9 @@ int rgssThreadFun(void *userdata){
SDL_GL_SwapWindow(win); SDL_GL_SwapWindow(win);
Debug() << "[main] GL Vendor :" << glGetStringInt(GL_VENDOR); Debug() << "[main] GL Vendor :" << glGetStringInt(GL_VENDOR);
Debug() << "[main] GL Renderer :" << glGetStringInt(GL_RENDERER); Debug() << "[main] GL Renderer :" << glGetStringInt(GL_RENDERER);
Debug() << "[main] GL Version :" << glGetStringInt(GL_VERSION); Debug() << "[main] GL Version :" << glGetStringInt(GL_VERSION);
Debug() << "[main] GLSL Version :" << glGetStringInt(GL_SHADING_LANGUAGE_VERSION); Debug() << "[main] GLSL Version :" << glGetStringInt(GL_SHADING_LANGUAGE_VERSION);
bool vsync = conf.vsync || conf.syncToRefreshrate; bool vsync = conf.vsync || conf.syncToRefreshrate;
SDL_GL_SetSwapInterval(vsync ? 1 : 0); SDL_GL_SetSwapInterval(vsync ? 1 : 0);
@ -198,7 +198,7 @@ static void setGamePathInRegistry() {
} }
if (keyOpenError != ERROR_SUCCESS){ if (keyOpenError != ERROR_SUCCESS){
WatnMsg("Unable to open registry."); WarnMsg("Unable to open registry.");
} }
else { else {
DWORD dataSize = (strlen(dataDir) + 1) * sizeof(char); DWORD dataSize = (strlen(dataDir) + 1) * sizeof(char);

1
src/oneshot.cpp
View file

@ -17,7 +17,6 @@
// OS-Specific code // OS-Specific code
#if defined(_WIN32) #if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#define SECURITY_WIN32 #define SECURITY_WIN32
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>