Merge branch 'master' of ssh://code.nikooneshot.ru:222/Sunshine/mkxp-sunshine

This commit is contained in:
Issac332 2026-07-05 10:10:49 +03:00
commit 0c8b23eae1
3 changed files with 2 additions and 7 deletions

View file

@ -7,15 +7,12 @@ Programmers:
Artists: Artists:
* Issac332 * Issac332
* Creature_of_steel1 * Creature_of_steel1
* Dess * DesMo
Testers: Testers:
* Rubik * Rubik
* Prime 223432 * Prime 223432
External artists:
* "Ргинша"
Donators: Donators:
* Kodu * Kodu

View file

@ -1,4 +1,3 @@
class Particle class Particle
def initialize(viewport, bitmap) def initialize(viewport, bitmap)
@sprite = Sprite.new(viewport) @sprite = Sprite.new(viewport)
@ -7,7 +6,6 @@ class Particle
@sprite.oy = bitmap.height / 2 @sprite.oy = bitmap.height / 2
self.x = rand(Graphics.width) self.x = rand(Graphics.width)
self.y = rand(Graphics.height) self.y = rand(Graphics.height)
RPG::Mod.exec_hooks("hooks/Particle/main", binding)
end end
# Link various things to the sprite # Link various things to the sprite

View file

@ -137,7 +137,7 @@ void crash(Exception::Type t, const char *fmt, ...){
o << "[Hardware]" << std::endl; o << "[Hardware]" << std::endl;
o << "L1 cache line size: " << SDL_GetCPUCacheLineSize() << std::endl; o << "L1 cache line size: " << SDL_GetCPUCacheLineSize() << std::endl;
o << "number of logical CPU cores: " << SDL_GetNumLogicalCPUCores() << std::endl; o << "number of logical CPU cores: " << SDL_GetNumLogicalCPUCores() << std::endl;
o << "System page size: " << SDL_GetSystemPageSize() << " bytes" << std::endl; //o << "System page size: " << SDL_GetSystemPageSize() << " bytes" << std::endl;
o << "System RAM size: " << SDL_GetSystemRAM() << " MiB" << std::endl; o << "System RAM size: " << SDL_GetSystemRAM() << " MiB" << std::endl;
o.close(); o.close();
}else{ }else{