Commit: 3bca299fa04a19c608cc8336daf92693637309b3 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: 3bca299fa04a19c608cc8336daf92693637309b3 (tree)
• Zeit: 2019-07-30 13:09:15
• Autor: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

sffのコピー画像を読み込む際にパレット情報を必ず上書きしていたのを修正
varの情報を保存して読み込む機能を追加

Ändern Zusammenfassung

• modified: src/bytecode.go
• modified: src/char.go
• modified: src/compiler.go
• modified: src/image.go
• modified: src/system.go

Diff

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -1,7 +1,9 @@
 package main
 
 import (
+	"encoding/gob"
 	"math"
+	"os"
 	"path/filepath"
 	"unsafe"
 )
@@ -5883,6 +5885,110 @@ func (sc matchRestart) Run(c *Char, _ []int32) bool {
 	return false
 }
 
+type saveFile StateControllerBase
+
+const (
+	saveFile_path byte = iota
+	saveFile_saveData
+	saveFile_redirectid
+)
+
+func (sc saveFile) Run(c *Char, _ []int32) bool {
+	crun := c
+	var path string
+	var data SaveData
+	StateControllerBase(sc).run(c, func(id byte, exp []BytecodeExp) bool {
+		switch id {
+		case saveFile_path:
+			path = string(*(*[]byte)(unsafe.Pointer(&exp[0])))
+		case saveFile_saveData:
+			data = SaveData(exp[0].evalI(c))
+		case saveFile_redirectid:
+			if rid := sys.playerID(exp[0].evalI(c)); rid != nil {
+				crun = rid
+			} else {
+				return false
+			}
+		}
+		return true
+	})
+	if path != "" {
+		encodeFile, err := os.Create(filepath.Dir(c.gi().def) + "/" + path)
+		if err != nil {
+			panic(err)
+		}
+		defer encodeFile.Close()
+		encoder := gob.NewEncoder(encodeFile)
+		switch data {
+		case SaveData_map:
+			if err := encoder.Encode(crun.mapArray); err != nil {
+				panic(err)
+			}
+		case SaveData_var:
+			if err := encoder.Encode(crun.ivar); err != nil {
+				panic(err)
+			}
+		case SaveData_fvar:
+			if err := encoder.Encode(crun.fvar); err != nil {
+				panic(err)
+			}
+		}
+	}
+	return false
+}
+
+type loadFile StateControllerBase
+
+const (
+	loadFile_path byte = iota
+	loadFile_saveData
+	loadFile_redirectid
+)
+
+func (sc loadFile) Run(c *Char, _ []int32) bool {
+	crun := c
+	var path string
+	var data SaveData
+	StateControllerBase(sc).run(c, func(id byte, exp []BytecodeExp) bool {
+		switch id {
+		case loadFile_path:
+			path = string(*(*[]byte)(unsafe.Pointer(&exp[0])))
+		case loadFile_saveData:
+			data = SaveData(exp[0].evalI(c))
+		case loadFile_redirectid:
+			if rid := sys.playerID(exp[0].evalI(c)); rid != nil {
+				crun = rid
+			} else {
+				return false
+			}
+		}
+		return true
+	})
+	if path != "" {
+		decodeFile, err := os.Open(filepath.Dir(c.gi().def) + "/" + path)
+		if err != nil {
+			panic(err)
+		}
+		defer decodeFile.Close()
+		decoder := gob.NewDecoder(decodeFile)
+		switch data {
+		case SaveData_map:
+			if err := decoder.Decode(&crun.mapArray); err != nil {
+				panic(err)
+			}
+		case SaveData_var:
+			if err := decoder.Decode(&crun.ivar); err != nil {
+				panic(err)
+			}
+		case SaveData_fvar:
+			if err := decoder.Decode(&crun.fvar); err != nil {
+				panic(err)
+			}
+		}
+	}
+	return false
+}
+
 type StateBytecode struct {
 	stateType StateType
 	moveType  MoveType

--- a/src/char.go
+++ b/src/char.go
@@ -90,6 +90,14 @@ const (
 	Space_screen
 )
 
+type SaveData int32
+
+const (
+	SaveData_map SaveData = iota
+	SaveData_var
+	SaveData_fvar
+)
+
 type ClsnRect [][4]float32
 
 func (cr *ClsnRect) Add(clsn []float32, x, y, xs, ys float32) {

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -126,6 +126,8 @@ func newCompiler() *Compiler {
 		"zoom":               c.zoom,
 		"mapset":             c.mapSet,
 		"matchrestart":       c.matchRestart,
+		"savefile":           c.saveFile,
+		"loadfile":           c.loadFile,
 		"forcefeedback":      c.null,
 		"null":               c.null,
 	}
@@ -2808,6 +2810,27 @@ func (c *Compiler) paramSpace(is IniSection, sc *StateControllerBase,
 	})
 }
 
+func (c *Compiler) paramSaveData(is IniSection, sc *StateControllerBase,
+	id byte) error {
+	return c.stateParam(is, "savedata", func(data string) error {
+		if len(data) <= 1 {
+			return Error("値が指定されていません")
+		}
+		var sv SaveData
+		if len(data) >= 2 {
+			if strings.ToLower(data[:2]) == "ma" {
+				sv = SaveData_map
+			} else if strings.ToLower(data[:2]) == "va" {
+				sv = SaveData_var
+			} else if strings.ToLower(data[:2]) == "fv" {
+				sv = SaveData_fvar
+			}
+		}
+		sc.add(id, sc.iToExp(int32(sv)))
+		return nil
+	})
+}
+
 func (c *Compiler) paramTrans(is IniSection, sc *StateControllerBase,
 	prefix string, id byte, afterImage bool) error {
 	return c.stateParam(is, prefix+"trans", func(data string) error {
@@ -6381,6 +6404,54 @@ func (c *Compiler) matchRestart(is IniSection, sc *StateControllerBase,
 	return *ret, err
 }
 
+func (c *Compiler) saveFile(is IniSection, sc *StateControllerBase,
+	_ int8) (StateController, error) {
+	ret, err := (*saveFile)(sc), c.stateSec(is, func() error {
+		if err := c.paramValue(is, sc, "redirectid",
+			saveFile_redirectid, VT_Int, 1, false); err != nil {
+			return err
+		}
+		if err := c.stateParam(is, "path", func(data string) error {
+			if len(data) < 2 || data[0] != '"' || data[len(data)-1] != '"' {
+				return Error("\"で囲まれていません")
+			}
+			sc.add(saveFile_path, sc.beToExp(BytecodeExp(data[1:len(data)-1])))
+			return nil
+		}); err != nil {
+			return err
+		}
+		if err := c.paramSaveData(is, sc, saveFile_saveData); err != nil {
+			return err
+		}
+		return nil
+	})
+	return *ret, err
+}
+
+func (c *Compiler) loadFile(is IniSection, sc *StateControllerBase,
+	_ int8) (StateController, error) {
+	ret, err := (*loadFile)(sc), c.stateSec(is, func() error {
+		if err := c.paramValue(is, sc, "redirectid",
+			loadFile_redirectid, VT_Int, 1, false); err != nil {
+			return err
+		}
+		if err := c.stateParam(is, "path", func(data string) error {
+			if len(data) < 2 || data[0] != '"' || data[len(data)-1] != '"' {
+				return Error("\"で囲まれていません")
+			}
+			sc.add(loadFile_path, sc.beToExp(BytecodeExp(data[1:len(data)-1])))
+			return nil
+		}); err != nil {
+			return err
+		}
+		if err := c.paramSaveData(is, sc, loadFile_saveData); err != nil {
+			return err
+		}
+		return nil
+	})
+	return *ret, err
+}
+
 func (c *Compiler) null(is IniSection, sc *StateControllerBase,
 	_ int8) (StateController, error) {
 	return nullStateController, nil

--- a/src/image.go
+++ b/src/image.go
@@ -513,7 +513,9 @@ func (s *Sprite) shareCopy(src *Sprite) {
 	s.Pal = src.Pal
 	s.Tex = src.Tex
 	s.Size = src.Size
-	s.palidx = src.palidx
+	if s.palidx < 0 {
+		s.palidx = src.palidx
+	}
 }
 func (s *Sprite) GetPal(pl *PaletteList) []uint32 {
 	if s.Pal != nil || s.rle <= -11 {

--- a/src/system.go
+++ b/src/system.go
@@ -64,15 +64,15 @@ var sys = System{
 	keyInput:         glfw.KeyUnknown,
 	keyString:        "",
 	// Localcoord sceenpack
-	luaSpriteScale:			1,
-	luaSmallPortraitScale:	1,
-	luaBigPortraitScale:	1,
-	luaSpriteOffsetX:		0,
-	lifebarScale:			1,
-	lifebarOffsetX:			0,
+	luaSpriteScale:        1,
+	luaSmallPortraitScale: 1,
+	luaBigPortraitScale:   1,
+	luaSpriteOffsetX:      0,
+	lifebarScale:          1,
+	lifebarOffsetX:        0,
 	//Shader vars
 	MultisampleAntialiasing: false,
-	PostProcessingShader:	0,
+	PostProcessingShader:    0,
 }
 
 type TeamMode int32
@@ -256,7 +256,7 @@ type System struct {
 	lifebarOffsetX        float32
 	LocalcoordScalingType int32
 
-	PostProcessingShader int32
+	PostProcessingShader    int32
 	MultisampleAntialiasing bool
 }