diff --git a/install.command b/install.command index ca9e378..bcb1a75 100755 --- a/install.command +++ b/install.command @@ -28,5 +28,5 @@ ln -sfh "$ONESHOT_PATH/OneShot.app" "$HOME/Applications/OneShot.app" rm -f /tmp/oneshot-pipe # Important for pre-release version cleanup -echo "\n${green}Complete! ${white}Please report any issues to https://github.com/vinyldarkscratch/synglechance/issues${color_reset}" -open "$ONESHOT_PATH" \ No newline at end of file +echo "\n${green}Complete! ${white}Please report any issues to https://github.com/ZakatTeamI2P/mkxp-sunshine/issues${color_reset}" +open "$ONESHOT_PATH" diff --git a/oclint.sh b/oclint.sh deleted file mode 100644 index 895c463..0000000 --- a/oclint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -cd `dirname $0` -cd oclint - -oclint -report-type html -o report.html ../src/alstream.cpp ../src/audio.cpp ../src/audiostream.cpp ../src/autotiles.cpp ../src/bitmap.cpp ../src/config.cpp ../src/etc.cpp ../src/eventthread.cpp ../src/filesystem.cpp ../src/font.cpp ../src/gl-debug.cpp ../src/gl-fun.cpp ../src/gl-meta.cpp ../src/glstate.cpp ../src/graphics.cpp ../src/i18n.cpp ../src/input.cpp ../src/keybindings.cpp ../src/mac-desktop.mm ../src/main.cpp ../src/oneshot.cpp ../src/plane.cpp ../src/rgssad.cpp ../src/scene.cpp ../src/screen.cpp ../src/sdlsoundsource.cpp ../src/settingsmenu.cpp ../src/shader.cpp ../src/sharedstate.cpp ../src/soundemitter.cpp ../src/sprite.cpp ../src/steam.cpp ../src/table.cpp ../src/texpool.cpp ../src/tileatlas.cpp ../src/tilemap.cpp ../src/tilequad.cpp ../src/vertex.cpp ../src/viewport.cpp ../src/vorbissource.cpp ../src/window.cpp ../binding-mri/audio-binding.cpp ../binding-mri/binding-mri.cpp ../binding-mri/binding-util.cpp ../binding-mri/bitmap-binding.cpp ../binding-mri/chroma-binding.cpp ../binding-mri/etc-binding.cpp ../binding-mri/filesystem-binding.cpp ../binding-mri/font-binding.cpp ../binding-mri/graphics-binding.cpp ../binding-mri/input-binding.cpp ../binding-mri/journal-binding.cpp ../binding-mri/module_rpg.cpp ../binding-mri/niko-binding.cpp ../binding-mri/oneshot-binding.cpp ../binding-mri/plane-binding.cpp ../binding-mri/screen-binding.cpp ../binding-mri/sprite-binding.cpp ../binding-mri/steam-binding.cpp ../binding-mri/table-binding.cpp ../binding-mri/tilemap-binding.cpp ../binding-mri/viewport-binding.cpp ../binding-mri/wallpaper-binding.cpp ../binding-mri/window-binding.cpp -- -c -pipe -stdlib=libc++ -O2 -std=gnu++11 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -mmacosx-version-min=10.10 -Wall -W -fPIC -DNDEBUG -DBINDING_MRI -D_THREAD_SAFE -I. -I. -Isrc -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers -I/usr/local/Cellar/libsigc++/2.10.0/include/sigc++-2.0 -I/usr/local/Cellar/libsigc++/2.10.0/lib/sigc++-2.0/include -I/usr/local/Cellar/pixman/0.34.0_1/include/pixman-1 -I/usr/local/include/SDL2 -I/usr/local/include -I/usr/local/include/AL -I/usr/local/Cellar/libvorbis/1.3.6/include -I/usr/local/Cellar/libogg/1.3.3/include -I/usr/local/Cellar/physfs/3.0.1/include -I/usr/local/Cellar/ruby/2.5.0_2/include/ruby-2.5.0/x86_64-darwin17 -I/usr/local/Cellar/ruby/2.5.0_2/include/ruby-2.5.0 -I/usr/local/Cellar/qt/5.10.1/mkspecs/macx-clang - diff --git a/oneshot.conf b/oneshot.conf index 766434c..40e311f 100644 --- a/oneshot.conf +++ b/oneshot.conf @@ -38,7 +38,7 @@ # fixedAspectRatio=true # 16:9 support -# EXPEREMENTAL! +# Force Game work in 16:9. # (default: disabled) # # EnableSixteenByNine=false @@ -56,7 +56,6 @@ # # smoothScaling=false - # Sync screen redraws to the monitor refresh rate # (default: enabled) # @@ -73,7 +72,6 @@ # # frameSkip=true - # Use a fixed framerate that is approx. equal to the # native screen refresh rate. This is different from # "fixedFramerate" because the actual frame rate is @@ -84,13 +82,11 @@ # # syncToRefreshrate=false - # Don't use alpha blending when rendering text # (default: disabled) # # 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 @@ -99,7 +95,6 @@ # # subImageFix=false - # Enable framebuffer blitting if the driver is # capable of it. Some drivers carry buggy # implementations of this functionality, so @@ -108,7 +103,6 @@ # # enableBlitting=true - # Limit the maximum size (width, height) of # most textures mkxp will create (exceptions are # rendering backbuffers and similar). @@ -119,25 +113,21 @@ # # maxTextureSize=0 - # Set the base path of the game to '/path/to/game' # (default: executable directory) # # gameFolder=/path/to/game - # Allow symlinks for game assets to be followed # (default: disabled) # # allowSymlinks=false - # Set the game window icon to 'path/to/icon.png' # (default: none) # # iconPath=/path/to/icon.png - # Define raw scripts to be executed before the # actual Scripts.rxdata execution starts # (default: none) @@ -145,14 +135,12 @@ # 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 - # Add 'rtp1', 'rtp2.zip' and 'game.rgssad' to the # asset search path (multiple allowed) # (default: none) @@ -161,7 +149,6 @@ # RTP=/path/to/rtp2.zip # RTP=/path/to/game.rgssad - # Font substitutions allow drop-in replacements of fonts # to be used without changing the RGSS scripts, # eg. providing 'Open Sans' when the game thinkgs it's diff --git a/src/security.cpp b/src/security.cpp index a27f4c8..5d5bc00 100644 --- a/src/security.cpp +++ b/src/security.cpp @@ -7,12 +7,7 @@ #include //shitty shit scmp_filter_ctx ctx; - int seccomplist[] = {SCMP_SYS(bpf), SCMP_SYS(set_mempolicy), SCMP_SYS(set_mempolicy_home_node), SCMP_SYS(vhangup), SCMP_SYS(settimeofday), SCMP_SYS(stime), SCMP_SYS(clock_settime), SCMP_SYS(clock_settime64), - SCMP_SYS(iopl), SCMP_SYS(ioperm), SCMP_SYS(ptrace), SCMP_SYS(process_vm_writev), SCMP_SYS(process_vm_readv), SCMP_SYS(process_madvise), SCMP_SYS(pidfd_getfd), SCMP_SYS(kcmp), - SCMP_SYS(delete_module), SCMP_SYS(init_module), SCMP_SYS(init_module), SCMP_SYS(chroot), SCMP_SYS(reboot), SCMP_SYS(unshare), SCMP_SYS(umount2), SCMP_SYS(umount), SCMP_SYS(setns), SCMP_SYS(sethostname), SCMP_SYS(setdomainname), SCMP_SYS(bpf), SCMP_SYS(quotactl_fd), SCMP_SYS(quotactl), - SCMP_SYS(move_mount), SCMP_SYS(mount_setattr), SCMP_SYS(mount), SCMP_SYS(lsm_set_self_attr), SCMP_SYS(lsm_list_modules), SCMP_SYS(lsm_get_self_attr), SCMP_SYS(process_vm_readv), SCMP_SYS(process_vm_writev), SCMP_SYS(ptrace)}; - - char ro_paths[] = {"/"}; + int seccomplist[] = {SCMP_SYS(bpf), SCMP_SYS(set_mempolicy), SCMP_SYS(set_mempolicy_home_node), SCMP_SYS(vhangup), SCMP_SYS(settimeofday), SCMP_SYS(stime), SCMP_SYS(clock_settime), SCMP_SYS(clock_settime64), SCMP_SYS(iopl), SCMP_SYS(ioperm), SCMP_SYS(ptrace), SCMP_SYS(process_vm_writev), SCMP_SYS(process_vm_readv), SCMP_SYS(process_madvise), SCMP_SYS(pidfd_getfd), SCMP_SYS(kcmp), SCMP_SYS(delete_module), SCMP_SYS(init_module), SCMP_SYS(init_module), SCMP_SYS(chroot), SCMP_SYS(reboot), SCMP_SYS(unshare), SCMP_SYS(umount2), SCMP_SYS(umount), SCMP_SYS(setns), SCMP_SYS(sethostname), SCMP_SYS(setdomainname), SCMP_SYS(bpf), SCMP_SYS(quotactl_fd), SCMP_SYS(quotactl), SCMP_SYS(move_mount), SCMP_SYS(mount_setattr), SCMP_SYS(mount), SCMP_SYS(lsm_set_self_attr), SCMP_SYS(lsm_list_modules), SCMP_SYS(lsm_get_self_attr), SCMP_SYS(process_vm_readv), SCMP_SYS(process_vm_writev), SCMP_SYS(ptrace)}; #endif void SecurityManagerInit(){ diff --git a/src/tilemap.cpp b/src/tilemap.cpp index 6d56430..011b8d7 100644 --- a/src/tilemap.cpp +++ b/src/tilemap.cpp @@ -42,8 +42,7 @@ #include #include -#include -#include +#include #include #include @@ -334,7 +333,7 @@ struct TilemapPrivate { zOrderDirty(false), tilemapReady(false) { - memset(autotiles, 0, sizeof(autotiles)); + SDL_memset(autotiles, 0, sizeof(autotiles)); atlas.animatedATs.reserve(autotileCount); atlas.efTilesetH = 0; @@ -357,8 +356,7 @@ struct TilemapPrivate { for (size_t i = 0; i < zlayersMax; ++i) elem.zlayers[i] = new ZLayer(this, viewport); - prepareCon = shState->prepareDraw.connect - (sigc::mem_fun(this, &TilemapPrivate::prepare)); + prepareCon = shState->prepareDraw.connect(sigc::mem_fun(this, &TilemapPrivate::prepare)); updateFlashMapViewport(); } @@ -499,13 +497,11 @@ struct TilemapPrivate { if (blitW <= autotileW && tiles.animated){ /* Static autotile */ for (int j = 0; j < 4; ++j) - GLMeta::blitRectangle(IntRect(0, 0, blitW, blitH), - Vec2i(autotileW*j, atInd*autotileH)); + GLMeta::blitRectangle(IntRect(0, 0, blitW, blitH), Vec2i(autotileW*j, atInd*autotileH)); } else{ /* Animated autotile */ - GLMeta::blitRectangle(IntRect(0, 0, blitW, blitH), - Vec2i(0, atInd*autotileH)); + GLMeta::blitRectangle(IntRect(0, 0, blitW, blitH), Vec2i(0, atInd*autotileH)); } } @@ -535,8 +531,7 @@ struct TilemapPrivate { Vec2i texSize; shState->ensureTexSize(tsLaneW, blitOp.h, texSize); shState->bindTex(); - GLMeta::subRectImageUpload(tsSurf->w, blitOp.src.x, blitOp.src.y, - 0, 0, tsLaneW, blitOp.h, tsSurf, GL_RGBA); + GLMeta::subRectImageUpload(tsSurf->w, blitOp.src.x, blitOp.src.y, 0, 0, tsLaneW, blitOp.h, tsSurf, GL_RGBA); shader.setTexSize(texSize); quad.setTexRect(FloatRect(0, 0, tsLaneW, blitOp.h)); @@ -556,8 +551,7 @@ struct TilemapPrivate { for (size_t i = 0; i < blits.size(); ++i){ const TileAtlas::Blit &blitOp = blits[i]; - GLMeta::subRectImageUpload(tsSurf->w, blitOp.src.x, blitOp.src.y, - blitOp.dst.x, blitOp.dst.y, tsLaneW, blitOp.h, tsSurf, GL_RGBA); + GLMeta::subRectImageUpload(tsSurf->w, blitOp.src.x, blitOp.src.y, blitOp.dst.x, blitOp.dst.y, tsLaneW, blitOp.h, tsSurf, GL_RGBA); } GLMeta::subRectImageEnd(); @@ -572,8 +566,7 @@ struct TilemapPrivate { for (size_t i = 0; i < blits.size(); ++i){ const TileAtlas::Blit &blitOp = blits[i]; - GLMeta::blitRectangle(IntRect(blitOp.src.x, blitOp.src.y, tsLaneW, blitOp.h), - blitOp.dst); + GLMeta::blitRectangle(IntRect(blitOp.src.x, blitOp.src.y, tsLaneW, blitOp.h), blitOp.dst); } GLMeta::blitEnd(); @@ -628,8 +621,7 @@ struct TilemapPrivate { if (!wrapping && (ox < 0 || oy < 0 || ox >= mapData->xSize() || oy >= mapData->ySize())) return; - int tileInd = - tableGetWrapped(*mapData, ox, oy, z); + int tileInd = tableGetWrapped(*mapData, ox, oy, z); /* Check for empty space */ if (tileInd < 48) @@ -718,8 +710,7 @@ struct TilemapPrivate { if (zlayerVert[i].empty()) continue; - VBO::uploadSubData(quadDataSize(zlayerBases[i]), - quadDataSize(zlayerSize(i)), dataPtr(zlayerVert[i])); + VBO::uploadSubData(quadDataSize(zlayerBases[i]), quadDataSize(zlayerSize(i)), dataPtr(zlayerVert[i])); } VBO::unbind(); @@ -1141,8 +1132,7 @@ void Tilemap::setPriorities(Table *value){ p->invalidateBuffers(); p->prioritiesCon.disconnect(); - p->prioritiesCon = value->modified.connect - (sigc::mem_fun(p, &TilemapPrivate::invalidateBuffers)); + p->prioritiesCon = value->modified.connect(sigc::mem_fun(p, &TilemapPrivate::invalidateBuffers)); } void Tilemap::setVisible(bool value){ diff --git a/src/tilequad.h b/src/tilequad.h index da40ae4..b35b7d2 100644 --- a/src/tilequad.h +++ b/src/tilequad.h @@ -35,23 +35,15 @@ namespace TileQuads{ /* Calculate needed quad counts */ - int oneDimCount(int tileDimension, - int destDimension); - int twoDimCount(int tileW, int tileH, - int destW, int destH); + int oneDimCount(int tileDimension, int destDimension); + int twoDimCount(int tileW, int tileH, int destW, int destH); /* Build tiling quads */ - int buildH(const IntRect &sourceRect, - int width, int x, int y, - Vertex *verts); + int buildH(const IntRect &sourceRect, int width, int x, int y, Vertex *verts); - int buildV(const IntRect &sourceRect, - int height, int ox, int oy, - Vertex *verts); + int buildV(const IntRect &sourceRect, int height, int ox, int oy, Vertex *verts); - int build(const IntRect &sourceRect, - const IntRect &destRect, - Vertex *verts); + int build(const IntRect &sourceRect, const IntRect &destRect, Vertex *verts); /* Build a quad "frame" (see Window cursor_rect) */ int buildFrame(const IntRect &rect, Vertex vert[36]);