curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 03:24:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

the manual saving will unset the quicksave and autosave flags; save.1 won't overwrite save.2 if the target is .2 is cleansave and .1 is dirty

Browse Source
This commit is contained in:
minjaesong
2021-09-29 19:05:26 +09:00
parent 7ddde8e4f0
commit 277ecbcebd
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/net/torvald/terrarum/IngameInstance.kt
View File

@@ -19,11 +19,10 @@ import net.torvald.terrarum.ui.ConsoleWindow
import net.torvald.util.SortedArrayList import net.torvald.util.SortedArrayList
import org.khelekore.prtree.* import org.khelekore.prtree.*
import java.io.File import java.io.File
import java.io.FileInputStream
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.io.IOException
import java.util.* import java.util.*
import java.util.concurrent.locks.Lock import java.util.concurrent.locks.Lock
import kotlin.collections.ArrayList
/** /**
* Although the game (as product) can have infinitely many stages/planets/etc., those stages must be manually managed by YOU; * Although the game (as product) can have infinitely many stages/planets/etc., those stages must be manually managed by YOU;
@@ -367,11 +366,18 @@ open class IngameInstance(val batch: SpriteBatch) : Screen {
*/ */
fun makeSavegameBackupCopy() { fun makeSavegameBackupCopy() {
try { try {
File(App.defaultSaveDir, INGAME.savegameNickname+".1").copyTo( // do not overwrite clean .2 with dirty .1
File(App.defaultSaveDir, INGAME.savegameNickname+".2"), // don't use .bak as it's used by the savecracker val file2 = File(App.defaultSaveDir, INGAME.savegameNickname+".2")
true val file1 = File(App.defaultSaveDir, INGAME.savegameNickname+".1")
)
} catch (e: NoSuchFileException) {} val flags2 = FileInputStream(file2).let { it.skip(49L); val r = it.read(); it.close(); r }
val flags1 = FileInputStream(file1).let { it.skip(49L); val r = it.read(); it.close(); r }
if (!(flags2 == 0 && flags1 != 0)) {
file1.copyTo(file2, true)
}
} catch (e: NoSuchFileException) {
} catch (e: FileNotFoundException) {}
try { try {
File(App.defaultSaveDir, INGAME.savegameNickname).copyTo( File(App.defaultSaveDir, INGAME.savegameNickname).copyTo(
File(App.defaultSaveDir, INGAME.savegameNickname+".1"), // don't use .bak as it's used by the savecracker File(App.defaultSaveDir, INGAME.savegameNickname+".1"), // don't use .bak as it's used by the savecracker

10
src/net/torvald/terrarum/modulebasegame/console/Save.kt
View File

@@ -1,19 +1,13 @@
package net.torvald.terrarum.modulebasegame.console package net.torvald.terrarum.modulebasegame.console
import net.torvald.terrarum.App import net.torvald.terrarum.App
import net.torvald.terrarum.CommonResourcePool
import net.torvald.terrarum.ReferencingRanges
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ConsoleCommand import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.gameactors.Actor
import net.torvald.terrarum.gameactors.BlockMarkerActor
import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.tvda.DiskEntry
import net.torvald.terrarum.tvda.VDUtil
import net.torvald.terrarum.tvda.VirtualDisk
import net.torvald.terrarum.serialise.Common import net.torvald.terrarum.serialise.Common
import net.torvald.terrarum.serialise.WriteSavegame import net.torvald.terrarum.serialise.WriteSavegame
import net.torvald.terrarum.tvda.VDUtil
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
@@ -28,7 +22,7 @@ object Save : ConsoleCommand {
val ingame = Terrarum.ingame!! as TerrarumIngame val ingame = Terrarum.ingame!! as TerrarumIngame
val savename = args[1].trim() val savename = args[1].trim()
val disk = VDUtil.createNewDisk(1L shl 60, savename, Common.CHARSET) val disk = VDUtil.createNewDisk(1L shl 60, savename, Common.CHARSET)
val file = File(App.defaultDir + "/Exports/${args[1]}") val file = File(App.defaultSaveDir + "/${args[1]}")
WriteSavegame(disk, file, ingame) WriteSavegame(disk, file, ingame)

3
src/net/torvald/terrarum/serialise/GameSavingThread.kt
View File

@@ -1,6 +1,5 @@
package net.torvald.terrarum.serialise package net.torvald.terrarum.serialise
import com.badlogic.gdx.graphics.Pixmap
import net.torvald.gdx.graphics.PixmapIO2 import net.torvald.gdx.graphics.PixmapIO2
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
@@ -30,6 +29,8 @@ class GameSavingThread(val disk: VirtualDisk, val outFile: File, val ingame: Ter
private val actorProgressMultiplier = 1f private val actorProgressMultiplier = 1f
override fun run() { override fun run() {
disk.saveMode = 0 // no quick, no auto
if (hasThumbnail) { if (hasThumbnail) {
while (!IngameRenderer.fboRGBexportedLatch) { while (!IngameRenderer.fboRGBexportedLatch) {
Thread.sleep(1L) Thread.sleep(1L)

4
src/net/torvald/terrarum/serialise/WriteWorld.kt
View File

@@ -35,8 +35,8 @@ object WriteWorld {
world.totalPlayTime += currentPlayTime_t world.totalPlayTime += currentPlayTime_t
val actorIDbuf = ArrayList<ActorID>() val actorIDbuf = ArrayList<ActorID>()
ingame.actorContainerActive.filter { actorAcceptable(it) }.forEach { actorIDbuf.add(it.referenceID) } ingame.actorContainerActive.cloneToList().filter { actorAcceptable(it) }.forEach { actorIDbuf.add(it.referenceID) }
ingame.actorContainerInactive.filter { actorAcceptable(it) }.forEach { actorIDbuf.add(it.referenceID) } ingame.actorContainerInactive.cloneToList().filter { actorAcceptable(it) }.forEach { actorIDbuf.add(it.referenceID) }
world.actors.clear() world.actors.clear()
world.actors.addAll(actorIDbuf.sorted().distinct()) world.actors.addAll(actorIDbuf.sorted().distinct())