X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=plomrogue-server.py;h=8e706a0440386314e26cc1f163b3818cf78ed4d1;hb=7ce99d270acecb70f458c62c6dfcb1692727dbf1;hp=3c8b5e7856459bfe0eadca1b7497a7f106398de9;hpb=a59890f546edfdf80ec97ad54d4ef06c45567370;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index 3c8b5e7..8e706a0 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -1,3 +1,10 @@
+#!/usr/bin/python3
+
+# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+# or any later version. For details on its copyright, license, and warranties,
+# see the file NOTICE in the root directory of the PlomRogue source package.
+
+
import argparse
import errno
import os
@@ -26,7 +33,8 @@ def prep_library():
"""Prepare ctypes library at ./libplomrogue.so"""
libpath = ("./libplomrogue.so")
if not os.access(libpath, os.F_OK):
- raise SystemExit("No library " + libpath + ", run ./compile.sh first?")
+ raise SystemExit("No library " + libpath +
+ ", run ./compile-server.sh first?")
libpr = ctypes.cdll.LoadLibrary(libpath)
libpr.seed_rrand.argtypes = [ctypes.c_uint8, ctypes.c_uint32]
libpr.seed_rrand.restype = ctypes.c_uint32
@@ -56,10 +64,9 @@ def prep_library():
def strong_write(file, string):
- """Apply write(string), flush(), and os.fsync() to file."""
+ """Apply write(string), then flush()."""
file.write(string)
file.flush()
- os.fsync(file)
def setup_server_io():
@@ -99,11 +106,11 @@ def cleanup_server_io():
def helper(file_key, path_key):
if file_key in io_db:
io_db[file_key].close()
- if not io_db["kicked_by_rival"] \
- and os.access(io_db[path_key], os.F_OK):
- os.remove(io_db[path_key])
- helper("file_out", "path_out")
+ if not io_db["kicked_by_rival"] \
+ and os.access(io_db[path_key], os.F_OK):
+ os.remove(io_db[path_key])
helper("file_in", "path_in")
+ helper("file_out", "path_out")
helper("file_worldstate", "path_worldstate")
if "file_record" in io_db:
io_db["file_record"].close()
@@ -256,6 +263,8 @@ def parse_command_line_arguments():
parser = argparse.ArgumentParser()
parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
action='store')
+ parser.add_argument('-l', nargs="?", const="save", dest='savefile',
+ action="store")
parser.add_argument('-v', dest='verbose', action='store_true')
opts, unknown = parser.parse_known_args()
return opts
@@ -484,20 +493,27 @@ def update_map_memory(t, age_map=True):
t["T_MEMMAP"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
if not t["T_MEMDEPTHMAP"]:
t["T_MEMDEPTHMAP"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
- for pos in range(world_db["MAP_LENGTH"] ** 2):
- if "v" == chr(t["fovmap"][pos]):
- t["T_MEMDEPTHMAP"][pos] = ord("0")
- if " " == chr(t["T_MEMMAP"][pos]):
- t["T_MEMMAP"][pos] = world_db["MAP"][pos]
- continue
- if age_map and ord('0') <= t["T_MEMDEPTHMAP"][pos] \
- and ord('9') > t["T_MEMDEPTHMAP"][pos] \
- and not rand.next() % (2 ** (t["T_MEMDEPTHMAP"][pos] - 48)):
+ ord_v = ord("v")
+ ord_0 = ord("0")
+ ord_9 = ord("9")
+ ord_space = ord(" ")
+ for pos in [pos for pos in range(world_db["MAP_LENGTH"] ** 2)
+ if ord_v == t["fovmap"][pos]]:
+ t["T_MEMDEPTHMAP"][pos] = ord_0
+ if ord_space == t["T_MEMMAP"][pos]:
+ t["T_MEMMAP"][pos] = world_db["MAP"][pos]
+ if age_map:
+ for pos in [pos for pos in range(world_db["MAP_LENGTH"] ** 2)
+ if not ord_v == t["fovmap"][pos]
+ if ord_0 <= t["T_MEMDEPTHMAP"][pos]
+ if ord_9 > t["T_MEMDEPTHMAP"][pos]
+ if not rand.next() % (2 **
+ (t["T_MEMDEPTHMAP"][pos] - 48))]:
t["T_MEMDEPTHMAP"][pos] += 1
for mt in [mt for mt in t["T_MEMTHING"]
if "v" == chr(t["fovmap"][(mt[1] * world_db["MAP_LENGTH"])
+ mt[2]])]:
- t["T_MEMTHING"].remove(mt)
+ t["T_MEMTHING"].remove(mt)
for id in [id for id in world_db["Things"]
if not world_db["Things"][id]["carried"]]:
type = world_db["Things"][id]["T_TYPE"]
@@ -1599,7 +1615,7 @@ directions_db = {"east": "d", "south-east": "c", "south-west": "x",
"""File IO database."""
io_db = {
"path_save": "save",
- "path_record": "record",
+ "path_record": "record_save",
"path_worldconf": "confserver/world",
"path_server": "server/",
"path_in": "server/in",
@@ -1614,8 +1630,11 @@ io_db = {
try:
libpr = prep_library()
rand = RandomnessIO()
- setup_server_io()
opts = parse_command_line_arguments()
+ if opts.savefile:
+ io_db["path_save"] = opts.savefile
+ io_db["path_record"] = "record_" + opts.savefile
+ setup_server_io()
if opts.verbose:
io_db["verbose"] = True
if None != opts.replay: