issac meow

CMakeLists.txt

@@ -124,6 +124,7 @@ set(MAIN_HEADERS
 	src/i18n.h
 	src/meow.h
 	src/modloader.h
+	src/sunshine.h
 )
 
 set(MAIN_SOURCE

oneshot.conf

@@ -9,67 +9,47 @@
 # relative to gameFolder and ignoring both RTPs and
 # encrypted archives.
 
-# Debug mode
 # Enable reset on F12 press and other
-# (default: disabled)
+debugMode=false
-#
-# debugMode=false
 
 # Start game in fullscreen mode,
-# i.e. Big Picture/console mode.
+fullscreen=false
-# (default: disabled)
-#
-# fullscreen=false
 
-# screenMode
 # idk
-# (default: disabled)
+screenMode=false
-# screenMode=false
 
 # Display current FPS in Window title
-# (default: disabled)
+printFPS=false
-# printFPS=false
 
 # Preserve game screen aspect ratio,
 # as opposed to stretch-to-fill
-# (default: enabled)
+fixedAspectRatio=true
-#
-# fixedAspectRatio=true
 
 # 16:9 support
-# Force Game work in 16:9.
+EnableSixteenByNine=false
-# (default: disabled)
-#
-# EnableSixteenByNine=false
 
 # Controlling the resolution of the game window, 
 # it is not recommended to change. 
 # If you want to configure 16:9, use EnableSixteenByNine.
-#
+defScreenW=0
-# defScreenW=0
+defScreenH=0
-# defScreenH=0
 
 # Apply linear interpolation when game screen
 # is upscaled
-# (default: disabled)
+smoothScaling=false
-#
-# smoothScaling=false
 
 # Sync screen redraws to the monitor refresh rate
 # (default: enabled)
-#
+vsync=true
-# vsync=true
 
 # Enforce a static frame rate
 # (0 = disabled)
-#
+fixedFramerate=0
-# fixedFramerate=0
 
 
 # Skip (don't draw) frames when behind
 # (default: enabled)
-#
+frameSkip=true
-# frameSkip=true
 
 # Use a fixed framerate that is approx. equal to the
 # native screen refresh rate. This is different from
@@ -77,30 +57,23 @@
 # reported back to the game, ensuring correct timers.
 # If the screen refresh rate cannot be determined,
 # this option is force-disabled
-# (default: disabled)
+syncToRefreshrate=false
-#
-# syncToRefreshrate=false
 
 # Don't use alpha blending when rendering text
 # (default: disabled)
-#
+solidFonts=false
-# solidFonts=false
 
 # Work around buggy graphics drivers which don't
 # properly synchronize texture access, most
 # apparent when text doesn't show up or the map
 # tileset doesn't render at all
-# (default: disabled)
+subImageFix=false
-#
-# subImageFix=false
 
 # Enable framebuffer blitting if the driver is
 # capable of it. Some drivers carry buggy
 # implementations of this functionality, so
 # disabling it can be used as a workaround
-# (default: enabled)
+enableBlitting=true
-#
-# enableBlitting=true
 
 # Limit the maximum size (width, height) of
 # most textures mkxp will create (exceptions are
@@ -108,42 +81,28 @@
 # If set to 0, the hardware maximum is used.
 # This is useful for recording traces that can
 # be played back on machines with lower specs.
-# (default: 0)
+maxTextureSize=0
-#
-# maxTextureSize=0
 
 # Set the base path of the game to '/path/to/game'
-# (default: executable directory)
+gameFolder=/path/to/game
-#
-# gameFolder=/path/to/game
 
 # Allow symlinks for game assets to be followed
-# (default: disabled)
+allowSymlinks=false
-#
-# allowSymlinks=false
 
 # Set the game window icon to 'path/to/icon.png'
-# (default: none)
+iconPath=/path/to/icon.png
-#
-# iconPath=/path/to/icon.png
 
 # Define raw scripts to be executed before the
 # actual Scripts.rxdata execution starts
-# (default: none)
-#
 # preloadScript=my_win32_wrapper.rb
 # preloadScript=ruby18_fixes.rb
 
 # Index all accesible assets via their lower case path
 # (emulates windows case insensitivity)
-# (default: enabled)
+pathCache=true
-#
-# pathCache=true
 
 # Add 'rtp1', 'rtp2.zip' and 'game.rgssad' to the
 # asset search path (multiple allowed)
-# (default: none)
-#
 #RTP=/path/to/rtp1
 #RTP=/path/to/rtp2.zip
 #RTP=/path/to/game.rgssad
@@ -157,39 +116,28 @@
 # This is not connected to the built-in font, which is
 # always used when a non-existing font family is
 # requested by RGSS.
-# (default: none)
-#
 #fontSub=Arial>Open Sans
 #fontSub=Times New Roman>Liberation Serif
 
-
 # Because mkxp is usually distributed as a stand alone
 # build, no predefined load paths are initialized
 # ($:, $LOAD_PATH) in the MRI backend. With this option,
 # they can be specified manually (eg. when using a system
 # libruby.so). It is however recommended to statically
 # link all required gems into libruby.so.
-# (default: none)
-#
 #rubyLoadpath=/usr/lib64/ruby/
 #rubyLoadpath=/usr/local/share/ruby/site_ruby
 
-
 # Number of OpenAL sources to allocate for SE playback.
 # If there are a lot of sounds playing at the same time
 # and audibly cutting each other off, try increasing
 # this number. Maximum: 64.
-#
+SE.sourceCount=6
-# SE.sourceCount=6
 
 # [Windows only] Alloc console
 # Launch a console window with debug information along with the game.
-# (default: false)
+Windows_AllocConsole=false
-#
-# Windows_AllocConsole=false
 
 # Mods directory path
 # Path to mods directory 
-# (default: "mods")
+ModsDirPath="mods"
-# 
-# ModsDirPath="mods"

src/config.cpp

@@ -76,8 +76,8 @@ void Config::read(int argc, char *argv[]){
 	PO_DESC(fixedAspectRatio, bool, true) \
 	PO_DESC(smoothScaling, bool, false) \
 	PO_DESC(vsync, bool, true) \
-	PO_DESC(defScreenW, int, 0) \
+	PO_DESC(defScreenW, int, 640) \
-	PO_DESC(defScreenH, int, 0) \
+	PO_DESC(defScreenH, int, 480) \
 	PO_DESC(windowTitle, std::string, "") \
 	PO_DESC(ModsDirPath, std::string,"mods") \
 	PO_DESC(fixedFramerate, int, 0) \
@@ -172,13 +172,10 @@ void Config::read(int argc, char *argv[]){
 		game.title = "OneShot: Sunshine";
 	game.scripts = "Data/xScripts.rxdata";
 	
-	if(defScreenW == 0 || defScreenH == 0){
+	if(defScreenW == 640 || defScreenH == 480){
 		if (EnableSixteenByNine){
 			defScreenW = 1280;
 			defScreenH = 720;	
-		}else{
-			defScreenW = 640;
-			defScreenH = 480;
 		}
 	}
 

src/main.cpp

@@ -40,6 +40,7 @@
 #include <fstream>
 #include <cstdlib>
 #include <filesystem>
+#include <boost/chrono.hpp>
 
 #include "sharedstate.h"
 #include "eventthread.h"
@@ -50,6 +51,7 @@
 #include "i18n.h"
 #include "security.h"
 #include "modloader.h"
+#include "sunshine.h"
 
 #include "meow.h"
 
@@ -214,6 +216,7 @@ static void setGamePathInRegistry() {
 }
 int main(int argc, char *argv[]){
     SecurityManagerInit();
+    starttime = boost::chrono::high_resolution_clock::now();
 	loadLanguageMetadata(); //there will be a segfault on fclose if I don't move it here
 
 	SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0");

src/sunshine.h

@@ -0,0 +1,4 @@
+#include <boost/chrono.hpp>
+//помойка ебаная
+inline boost::chrono::high_resolution_clock::time_point starttime;
+