X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=f2e107515a70d212a678a7f47757746d7c01562c;hp=0eab6e8d19bacb4b49d0e89a655fed530f4633e9;hb=26bf324e072c8210ed3d709d6cf5063d3f749b18;hpb=87c6d3fb1e583e4d2fa6fd9532287b34b3948d77

diff --git a/main.c b/main.c
index 0eab6e8..f2e1075 100644
--- a/main.c
+++ b/main.c
@@ -1051,8 +1051,7 @@ Lclearobj:
             game.knfloc = 0;
 
 	/* Preserve state from last command for reuse when required */
-	command_t preserve;
-	memcpy(&preserve, &command, sizeof(command_t));
+	command_t preserve = command;
 
 	// Get command input from user
         if (!get_command_input(&command))
@@ -1123,8 +1122,7 @@ Lclearobj:
             }
             if ((command.word[0].id == WATER || command.word[0].id == OIL) && (command.word[1].id == PLANT || command.word[1].id == DOOR)) {
                 if (AT(command.word[1].id)) {
-		    memcpy(&command.word[1], &command.word[0],
-			   sizeof(command_word_t));
+		    command.word[1] = command.word[0];
 		    command.word[0].id = POUR;
                     command.word[0].type = ACTION;
                     strncpy(command.word[0].raw, "pour", LINESIZE - 1);
@@ -1137,13 +1135,9 @@ Lclearobj:
 
 	    /* From OV to VO form */
 	    if (command.word[0].type==OBJECT && command.word[1].type==ACTION) {
-		command_word_t stage;
-		memcpy(&stage, &command.word[0],
-			   sizeof(command_word_t));
-		memcpy(&command.word[0], &command.word[1],
-			   sizeof(command_word_t));
-		memcpy(&command.word[1], &stage,
-			   sizeof(command_word_t));
+		command_word_t stage = command.word[0];
+		command.word[0] = command.word[1];
+		command.word[1] = stage;
 	    }
         }