Kaynağa Gözat

Updated ansi-to-go. It handles the Unicode parts.

Steve Thielemann 3 yıl önce
ebeveyn
işleme
9fc49353c2
3 değiştirilmiş dosya ile 13 ekleme ve 14 silme
  1. 10 7
      Makefile
  2. 1 1
      ansi-to-go/ansi-to-go.go
  3. 2 6
      testdoor/testdoor.go

+ 10 - 7
Makefile

@@ -4,20 +4,23 @@ all: door32 testdoor/testdoor testdoor/art.go space-ace/space-ace
 
 font-out: font-out.go
 	go build font-out.go
-	go build font-show.go door/tdfont.go
+	cd font-show; go build
 
 
 door32: door32.c
 	gcc -o door32 door32.c
 
 testdoor/fonts.go: font-out
-	echo "package main\n\nimport \"red-green/door\"\n\n" > testdoor/fonts.go
-	./font-out -f "Amazon Cyan,Medieval,Anarchy Blue,Unchained,Asylum,ArmageonRed,BrainDmgBlu,Boner,Descent,Remorse,Dungeon" TDFONTS.TDF TDFONTS2.TDF TDFONTS9.TDF
-	cat *_font.go >> testdoor/fonts.go    
-	rm *_font.go
+	# echo "package main\n\nimport \"red-green/door\"\n\n" > testdoor/fonts.go
+	./font-out -f "Amazon Cyan,Medieval,Anarchy Blue,Unchained,Asylum,ArmageonRed,BrainDmgBlu,Boner,Descent,Remorse,Dungeon" TDFONTS.TDF TDFONTS2.TDF TDFONTS9.TDF > testdoor/fonts.go
+	# cat *_font.go >> testdoor/fonts.go    
+	# rm *_font.go
 
-testdoor/art.go: testdoor/growl.ans
-	./ansi-to-go.py main testdoor/growl.ans > testdoor/art.go
+ansi-to-go/ansi-to-go: ansi-to-go/ansi-to-go.go
+	cd ansi-to-go; go build
+
+testdoor/art.go: testdoor/growl.ans ansi-to-go/ansi-to-go
+	./ansi-to-go/ansi-to-go testdoor/growl.ans > testdoor/art.go
 
 space-ace/space.go: space.ans
 	./ansi-to-go.py main space.ans > space-ace/space.go

+ 1 - 1
ansi-to-go/ansi-to-go.go

@@ -72,7 +72,7 @@ func readfile(filename string) {
 	}
 	fmt.Println("  }")
 	fmt.Println("  if door.Unicode {")
-	fmt.Println("    for idx := range lines {")
+	fmt.Println("    for idx := range data {")
 	fmt.Println("      data[idx] = door.CP437_to_Unicode(data[idx])")
 	fmt.Println("    }")
 	fmt.Println("  }")

+ 2 - 6
testdoor/testdoor.go

@@ -94,14 +94,10 @@ func display_information(d *door.Door) {
 }
 
 func display_ansi(d *door.Door) {
-	art := GROWL()
+	art := ANSIGrowl()
 	d.Write(door.Clrscr)
 	for _, line := range art {
-		if door.Unicode {
-			d.Write(door.CP437_to_Unicode(line) + door.CRNL)
-		} else {
-			d.Write(line + door.CRNL)
-		}
+		d.Write(line + door.CRNL)
 	}
 }